/clr and /std:c++20

Author: morzhovets

.github/workflows/msvc_cli.yml

@@ -14,17 +14,22 @@ jobs:
       matrix:
         include:
 
-        # Visual Studio 2026
-        - win_ver: '2025-vs2026'
+        # Visual Studio 2022
+        - toolset: '14.4'
           build_type: 'Release'
           test_libcxx20: 'Off'
           flags: '/std:c++20 /WX'
+          win_ver: '2025'
 
     runs-on: windows-${{ matrix.win_ver }}
 
     steps:
     - name: Checkout
       uses: actions/checkout@v6
+    - name: Setup MSVC
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        toolset: ${{ matrix.toolset }}
     - name: Build
       env:
         CXXFLAGS: ${{ matrix.flags }}

include/momo/MemPool.h

@@ -34,7 +34,7 @@ class MemPoolConst
 
 public:
 	static constexpr size_t GetBlockAlignment(size_t blockSize,
-		size_t maxAlignment = momo::internal::UIntConst::maxAlignment) noexcept	// c++/cli
+		size_t maxAlignment = internal::UIntConst::maxAlignment) noexcept
 	{
 		return (maxAlignment > blockSize && maxAlignment > 1)
 			? GetBlockAlignment(blockSize, maxAlignment / 2) : maxAlignment;

test/CMakeLists.txt

@@ -52,7 +52,7 @@ if(MOMO_TEST_NO_EXCEPTIONS_RTTI)
   target_compile_definitions(momo_test PRIVATE MOMO_TEST_NO_EXCEPTIONS_RTTI)
   if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     string(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")   # CMP0117, 3.20+
+    string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")  # CMP0117, 3.20+
     if(MSVC_VERSION LESS 1910)
       target_compile_options(momo_test PRIVATE /wd4577)
     endif()
@@ -77,13 +77,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     target_compile_definitions(momo_test PRIVATE _SCL_SECURE_NO_WARNINGS)
   endif()
   if(MSVC_VERSION GREATER_EQUAL 1910)
-    target_compile_options(momo_test PRIVATE /Zc:__cplusplus)
-    if(NOT MOMO_TEST_MSVC_CLI)
-      target_compile_options(momo_test PRIVATE /permissive-)
-    endif()
+    target_compile_options(momo_test PRIVATE /Zc:__cplusplus /permissive-)
   endif()
   if(MOMO_TEST_MSVC_CLI)
-    set_target_properties(momo_test PROPERTIES COMMON_LANGUAGE_RUNTIME "")
+    set_target_properties(momo_test PROPERTIES COMMON_LANGUAGE_RUNTIME "")  # .NET Framework
     set_target_properties(momo_test PROPERTIES CXX_SCAN_FOR_MODULES OFF)
   endif()
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU"