Update toolsets v143, windows sdk 10, C++17 standard; Update catch an…

…d fmt library
nieznanysprawiciel · Oct 12, 2024 · 03d5c4f · 03d5c4f
1 parent f680e96
commit 03d5c4f
Show file tree

Hide file tree

Showing 82 changed files with 27,728 additions and 15,074 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,6 +32,8 @@ jobs:
 
     - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.0.2
+      with:
+        msbuild-architecture: x64
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}

diff --git a/swCommonLib/Common/Buffers/BufferRaw.h b/swCommonLib/Common/Buffers/BufferRaw.h
@@ -8,7 +8,7 @@
 #include "swCommonLib/Common/TypesDefinitions.h"
 #include "swCommonLib/Common/RTTR.h"
 
-#include <allocators>
+#include <memory>
 
 
 

diff --git a/swCommonLib/Common/Buffers/BufferTyped.h b/swCommonLib/Common/Buffers/BufferTyped.h
@@ -10,7 +10,7 @@
 
 #include "BufferRaw.h"
 
-#include <allocators>
+#include <memory>
 #include <assert.h>
 
 

diff --git a/swCommonLib/Common/Converters/Convert.h b/swCommonLib/Common/Converters/Convert.h
@@ -135,6 +135,10 @@ inline sw::Nullable< typename std::enable_if< std::is_enum< DstType >::value, Ds
 //			Wstring to string	
 //====================================================================================//
 
+// std::codecvt_utf8 deprecated since C++17 without replacement.
+#pragma warning( push )
+#pragma warning( disable: 4996 )
+
 // ================================ //
 //
 template<>
@@ -157,6 +161,8 @@ inline sw::Nullable< typename std::enable_if< std::is_same< SrcType, std::wstrin
 	return converter.from_bytes( value );
 }
 
+#pragma warning( pop )
+
 //====================================================================================//
 //				    Arithemetic types
 //====================================================================================//

diff --git a/swCommonLib/Common/fmt.h b/swCommonLib/Common/fmt.h
@@ -8,6 +8,7 @@
 // This is kind of joke!!
 // Disable including windows.h.
 #define FMT_USE_WINDOWS_H 0
+#define FMT_UNICODE 0
 
 #include "swCommonLib/External/fmt/format.h"