Add presets for compilation with v145 toolchain on windows

.teamcity/Windows/Project.kt

@@ -89,7 +89,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String)
             scriptContent = """
                 REM unfortunately ninja does not find the VS environment otherwise
                 REM NB: the exported PATH also contains the location where we installed sentry-cli, e.g. teamcity.agent.work.dir
-                call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\2017\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64
+                call "%%ProgramFiles(x86)%%\Microsoft Visual Studio\18\BuildTools\Common7\Tools\vsdevcmd.bat" -arch=x64
                 echo ##teamcity[setParameter name='env.INCLUDE' value='%%INCLUDE%%']
                 echo ##teamcity[setParameter name='env.LIB' value='%%LIB%%']
                 echo ##teamcity[setParameter name='env.LIBPATH' value='%%LIBPATH%%']

CMakePresets.json

@@ -43,7 +43,7 @@
       "name": "x64-windows",
       "inherits": "windows",
       "cacheVariables": {
-        "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake"
+        "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake"
       },
       "hidden": true
     },
@@ -70,35 +70,35 @@
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Internal",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-internal",
-        "VCPKG_HOST_TRIPLET": "x64-windows-internal"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-internal"
       }
     },
     {
       "name": "x64-windows-release",
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-release",
-        "VCPKG_HOST_TRIPLET": "x64-windows-release"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-release",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-release"
       }
     },
     {
       "name": "x64-windows-debug",
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-debug",
-        "VCPKG_HOST_TRIPLET": "x64-windows-debug"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-debug"
       }
     },
     {
       "name": "x64-windows-trinitydev",
       "inherits": "x64-windows",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "TrinityDev",
-        "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev",
-        "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev",
+        "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev"
       }
     },
     {

include/CcpAtomic.h

@@ -28,98 +28,6 @@
 #include <atomic>
 #define CcpAtomic std::atomic
 
-#else
-
-#ifdef _WIN32
-
-template <typename T>
-class CcpAtomic
-{};
-
-template <>
-class CcpAtomic<uint32_t>
-{
-public:
-	CcpAtomic()
-	{
-	}
-
-	CcpAtomic( uint32_t initialValue )
-	{
-		store( initialValue );
-	}
-
-	uint32_t operator=( uint32_t desired )
-	{
-		uint32_t oldValue = InterlockedExchange( &m_value, desired );
-		return oldValue;
-	}
-
-	// Pre-increment
-	uint32_t operator++()
-	{
-		uint32_t oldValue = InterlockedIncrement( &m_value );
-		return oldValue;
-	}
-
-	// Post-increment
-	uint32_t operator++(int)
-	{
-		uint32_t oldValue = InterlockedIncrement( &m_value );
-		return oldValue - 1;
-	}
-
-	// Pre-decrement
-	uint32_t operator--()
-	{
-		uint32_t oldValue = InterlockedDecrement( &m_value );
-		return oldValue;
-	}
-
-	// Post-decrement
-	uint32_t operator--(int)
-	{
-		uint32_t oldValue = InterlockedDecrement( &m_value );
-		return oldValue + 1;
-	}
-
-	operator uint32_t() const
-	{
-		uint32_t curValue = InterlockedCompareExchange( const_cast<uint32_t*>( &m_value ), 0, 0 );
-		return curValue;
-	}
-
-	uint32_t operator+=( uint32_t arg )
-	{
-		uint32_t oldValue = InterlockedExchangeAdd( &m_value, arg );
-		return oldValue + arg;
-	}
-
-	void store( uint32_t val )
-	{
-		InterlockedExchange( &m_value, val );
-	}
-
-	bool compare_exchange_strong( uint32_t& expected, uint32_t desired )
-	{
-		auto prev = InterlockedCompareExchange( &m_value, desired, expected );
-		if( prev == expected )
-		{
-			return true;
-		}
-		expected = prev;
-		return false;
-	}
-
-private:
-	uint32_t m_value;
-
-private:
-	CcpAtomic(const CcpAtomic&);	// not defined
-	CcpAtomic& operator=(const CcpAtomic&);	// not defined
-};
-#endif
-
 #endif
 
 #endif // CcpAtomic_h

tests/CMakeLists.txt

@@ -4,7 +4,6 @@ enable_testing()
 
 find_package(GTest CONFIG REQUIRED)
 add_executable(CcpCoreTest
-    CcpAtomic.cpp
     CCPCallstack.cpp
     CcpCoreTest.cpp
     CCPHash.cpp