diff --git a/CMakeLists.txt b/CMakeLists.txt index a33eb47..1cc05ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # CMake based on work from @xantares cmake_minimum_required (VERSION 3.15.0) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) # By default, build in Release mode. Must appear before project() command @@ -28,6 +28,7 @@ endif() # Credit: https://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake/3818084 if(MSVC) + add_compile_definitions(NOMINMAX) # Force to always compile with W4 if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/include/muParserDef.h b/include/muParserDef.h index 599f04b..51f65c1 100644 --- a/include/muParserDef.h +++ b/include/muParserDef.h @@ -509,7 +509,7 @@ namespace mu static const int MaxLenExpression = 20000; static const int MaxLenIdentifier = 100; static const string_type ParserVersion = string_type(_T("2.3.4 (Develop)")); - static const string_type ParserVersionDate = string_type(_T("20231224")); + static const string_type ParserVersionDate = string_type(_T("20241210")); } // end of namespace #if defined(_MSC_VER)