Fix 0.4.0 release that has issue with newer MSVC version (#68)

Seagate · Dec 16, 2024 · f1480f7 · f1480f7
1 parent b2db9e0
commit f1480f7
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 73 deletions.
diff --git a/dependencies/nx_kit/CMakeLists.txt b/dependencies/nx_kit/CMakeLists.txt
@@ -80,6 +80,11 @@ if(MSVC)
     # This block covers not only Visual Studio compiler but also clang-cl, which expands /W4 to
     # the -Wall flag, while -Wall itself, if passed directly, will be expanded to -Weverything.
     add_compile_options(/W4 /WX /utf-8)
+
+    # Temporary fix to prevent crashes on startup of Network Optix Server
+    # Issue causes by compiling with MSVC 14.40 which has a code change incompatible
+    # with MSVC 14.38 which the Network Optix server is compiled with.
+    add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
     add_compile_options(-Wall -Wextra -Werror)
 endif()

diff --git a/dependencies/nx_kit/src/nx/kit/debug.cpp b/dependencies/nx_kit/src/nx/kit/debug.cpp
@@ -2,15 +2,6 @@
 
 #include "debug.h"
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <chrono>
 #include <deque>
 #include <fstream>

diff --git a/dependencies/nx_kit/src/nx/kit/ini_config.cpp b/dependencies/nx_kit/src/nx/kit/ini_config.cpp
@@ -2,15 +2,6 @@
 
 #include "ini_config.h"
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <cstdlib>
 #include <cstring>
 #include <fstream>

diff --git a/dependencies/nx_kit/src/nx/kit/ini_config.h b/dependencies/nx_kit/src/nx/kit/ini_config.h
@@ -2,15 +2,6 @@
 
 #pragma once
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <functional>
 #include <iostream>
 #include <vector>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -98,6 +98,11 @@ if(NOT MSVC)
         -Werror=format-security
     )
 else()
+    # Temporary fix to prevent crashes on startup of Network Optix Server
+    # Issue causes by compiling with MSVC 14.40 which has a code change incompatible
+    # with MSVC 14.38 which the Network Optix server is compiled with.
+    add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
+
     add_compile_definitions(_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
     target_compile_options(cloudfuse_plugin PRIVATE
         -W4 -GS -sdl

diff --git a/src/lib/nx/sdk/analytics/helpers/consuming_device_agent.h b/src/lib/nx/sdk/analytics/helpers/consuming_device_agent.h
@@ -2,15 +2,6 @@
 
 #pragma once
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <map>
 #include <mutex>
 #include <string>

diff --git a/src/lib/nx/sdk/analytics/helpers/engine.h b/src/lib/nx/sdk/analytics/helpers/engine.h
@@ -2,14 +2,6 @@
 
 #pragma once
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
 #include <map>
 #include <mutex>
 #include <string>

diff --git a/src/lib/nx/sdk/helpers/lib_context.h b/src/lib/nx/sdk/helpers/lib_context.h
@@ -2,15 +2,6 @@
 
 #pragma once
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <map>
 #include <memory>
 #include <mutex>

diff --git a/src/lib/nx/sdk/helpers/media_stream_statistics.h b/src/lib/nx/sdk/helpers/media_stream_statistics.h
@@ -2,15 +2,6 @@
 
 #pragma once
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <chrono>
 #include <deque>
 #include <limits>

diff --git a/src/lib/nx/sdk/helpers/uuid_helper.cpp b/src/lib/nx/sdk/helpers/uuid_helper.cpp
@@ -2,15 +2,6 @@
 
 #include "uuid_helper.h"
 
-// Temporary fix to prevent crashes on startup of Network Optix Server
-// Issue causes by compiling with MSVC 14.40 which has a code change incompatible
-// with MSVC 14.38 which the Network Optix server is compiled with.
-#if defined(_WIN32)
-#ifndef _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#define _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
-#endif
-#endif
-
 #include <limits>
 #include <sstream>
 #include <iomanip>

diff --git a/src/vcpkg.json b/src/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nx-lyve-cloud-plugin",
   "dependencies": [
-    { "name": "openssl", "version>=": "3.3.1" }
+    { "name": "openssl", "version>=": "3.3.2" }
   ],
-  "builtin-baseline": "4065f37d0a6628ef17cf6ee15385f9091f1075bc"
+  "builtin-baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
 }