fix: erroneous warnings

qudix · qudix · commit 44de3634eb19 · 2026-02-10T10:36:57.000-06:00
diff --git a/include/REX/REX.h b/include/REX/REX.h
@@ -1,25 +1,25 @@
 #pragma once
 
-#include "REX/CAST.h"
-#include "REX/CONVERT.h"
-#include "REX/FIniSettingStore.h"
-#include "REX/FJsonSettingStore.h"
-#include "REX/FMemoryMap.h"
-#include "REX/FModule.h"
-#include "REX/FModuleSection.h"
-#include "REX/FTomlSettingStore.h"
-#include "REX/HASH.h"
-#include "REX/ISetting.h"
-#include "REX/ISettingStore.h"
-#include "REX/LOG.h"
-#include "REX/TAtomicRef.h"
-#include "REX/TEnum.h"
-#include "REX/TEnumSet.h"
-#include "REX/TIniSetting.h"
-#include "REX/TJsonSetting.h"
-#include "REX/TScopeExit.h"
-#include "REX/TSetting.h"
-#include "REX/TSettingStore.h"
-#include "REX/TSingleton.h"
-#include "REX/TStaticString.h"
-#include "REX/TTomlSetting.h"
+#include "CAST.h"
+#include "CONVERT.h"
+#include "FIniSettingStore.h"
+#include "FJsonSettingStore.h"
+#include "FMemoryMap.h"
+#include "FModule.h"
+#include "FModuleSection.h"
+#include "FTomlSettingStore.h"
+#include "HASH.h"
+#include "ISetting.h"
+#include "ISettingStore.h"
+#include "LOG.h"
+#include "TAtomicRef.h"
+#include "TEnum.h"
+#include "TEnumSet.h"
+#include "TIniSetting.h"
+#include "TJsonSetting.h"
+#include "TScopeExit.h"
+#include "TSetting.h"
+#include "TSettingStore.h"
+#include "TSingleton.h"
+#include "TStaticString.h"
+#include "TTomlSetting.h"
diff --git a/include/REX/REX/AtomicRef.h b/include/REX/REX/AtomicRef.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/AtomicRef.h' is deprecated, please include 'REX/TAtomicRef.h'")
+#warning "The header 'REX/REX/AtomicRef.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TAtomicRef.h"
diff --git a/include/REX/REX/CAST.h b/include/REX/REX/CAST.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/CAST.h' is deprecated, please include 'REX/CAST.h'")
+#warning "The header 'REX/REX/CAST.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/CAST.h"
diff --git a/include/REX/REX/CONVERT.h b/include/REX/REX/CONVERT.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/CONVERT.h' is deprecated, please include 'REX/CONVERT.h'")
+#warning "The header 'REX/REX/CONVERT.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/CONVERT.h"
diff --git a/include/REX/REX/Enum.h b/include/REX/REX/Enum.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/Enum.h' is deprecated, please include 'REX/TEnum.h'")
+#warning "The header 'REX/REX/Enum.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TEnum.h"
diff --git a/include/REX/REX/EnumSet.h b/include/REX/REX/EnumSet.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/EnumSet.h' is deprecated, please include 'REX/TEnumSet.h'")
+#warning "The header 'REX/REX/EnumSet.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TEnumSet.h"
diff --git a/include/REX/REX/HASH.h b/include/REX/REX/HASH.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/HASH.h' is deprecated, please include 'REX/HASH.h'")
+#warning "The header 'REX/REX/HASH.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/HASH.h"
diff --git a/include/REX/REX/INI.h b/include/REX/REX/INI.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/INI.h' is deprecated, please include 'REX/TIniSetting.h' or 'REX/FIniSettingStore.h'")
+#warning "The header 'REX/REX/INI.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/FIniSettingStore.h"
 #include "REX/TIniSetting.h"
diff --git a/include/REX/REX/JSON.h b/include/REX/REX/JSON.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/JSON.h' is deprecated, please include 'REX/TJsonSetting.h' or 'REX/FJsonSettingStore.h'")
+#warning "The header 'REX/REX/JSON.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/FJsonSettingStore.h"
 #include "REX/TJsonSetting.h"
diff --git a/include/REX/REX/LOG.h b/include/REX/REX/LOG.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/LOG.h' is deprecated, please include 'REX/LOG.h'")
+#warning "The header 'REX/REX/LOG.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/LOG.h"
diff --git a/include/REX/REX/MemoryMap.h b/include/REX/REX/MemoryMap.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/MemoryMap.h' is deprecated, please include 'REX/FMemoryMap.h'")
+#warning "The header 'REX/REX/MemoryMap.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/FMemoryMap.h"
diff --git a/include/REX/REX/ScopeExit.h b/include/REX/REX/ScopeExit.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/ScopeExit.h' is deprecated, please include 'REX/TScopeExit.h'")
+#warning "The header 'REX/REX/ScopeExit.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TScopeExit.h"
diff --git a/include/REX/REX/Singleton.h b/include/REX/REX/Singleton.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/Singleton.h' is deprecated, please include 'REX/TSingleton.h'")
+#warning "The header 'REX/REX/Singleton.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TSingleton.h"
diff --git a/include/REX/REX/StaticString.h b/include/REX/REX/StaticString.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/StaticString.h' is deprecated, please include 'REX/TStaticString.h'")
+#warning "The header 'REX/REX/StaticString.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/TStaticString.h"
diff --git a/include/REX/REX/TOML.h b/include/REX/REX/TOML.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#pragma message("The header 'REX/REX/TOML.h' is deprecated, please include 'REX/TTomlSetting.h' or 'REX/FTomlSettingStore.h'")
+#warning "The header 'REX/REX/TOML.h' is deprecated, please include 'REX/REX.h'"
 
 #include "REX/FTomlSettingStore.h"
 #include "REX/TTomlSetting.h"
diff --git a/include/REX/TEnum.h b/include/REX/TEnum.h
@@ -88,9 +88,14 @@ namespace REX
 		using super::operator*;
 	};
 
+#pragma warning(push)
+#pragma warning(disable: 4996)
+
 	template <class... Args>
 	Enum(Args...) -> Enum<
 					  std::common_type_t<Args...>,
 					  std::underlying_type_t<
 						  std::common_type_t<Args...>>>;
+
+#pragma warning(pop)
 }
diff --git a/include/REX/TEnumSet.h b/include/REX/TEnumSet.h
@@ -203,11 +203,16 @@ namespace REX
 		using super::operator*;
 	};
 
+#pragma warning(push)
+#pragma warning(disable: 4996)
+
 	template <class... Args>
 	EnumSet(Args...) -> EnumSet<
 						 std::common_type_t<Args...>,
 						 std::underlying_type_t<
 							 std::common_type_t<Args...>>>;
+
+#pragma warning(pop)
 }
 
 #define REX_DEFINE_ENUM_CLASS_FLAGS(E)                                                                                                     \
diff --git a/xmake.lua b/xmake.lua
@@ -92,44 +92,53 @@ target("commonlib-shared", function()
     -- set precompiled header
     set_pcxxheader("src/REX/PCH.h")
 
-    -- add flags
-    add_cxxflags("/EHsc", "/permissive-", { public = true })
+    -- add flags (public)
+    add_cxxflags(
+        "/EHsc",
+        "/permissive-",
+        { public = true }
+    )
 
     -- add flags (cl)
+    add_cxxflags(
+        "cl::/external:W0"
+    )
+
+    -- add flags (cl) (public)
     add_cxxflags(
         "cl::/bigobj",
         "cl::/cgthreads8",
         "cl::/diagnostics:caret",
-        "cl::/external:W0",
         "cl::/fp:contract",
         "cl::/fp:except-",
         "cl::/guard:cf-",
         "cl::/Zc:preprocessor",
-        "cl::/Zc:templateScope"
+        "cl::/Zc:templateScope",
+        { public = true }
     )
 
-    -- add flags (cl: disable warnings)
+    -- add flags (cl: disable warnings) (public)
     add_cxxflags(
         "cl::/wd4200", -- nonstandard extension used : zero-sized array in struct/union
         "cl::/wd4201", -- nonstandard extension used : nameless struct/union
         "cl::/wd4324", -- structure was padded due to alignment specifier
         { public = true }
     )
 
-    -- add flags (cl: warnings -> errors)
+    -- add flags (cl: warnings -> errors) (public)
     add_cxxflags(
         "cl::/we4715", -- not all control paths return a value
         { public = true }
     )
 
-    -- add flags (clang-cl)
+    -- add flags (clang-cl) (public)
     add_cxxflags(
         "clang_cl::-fms-compatibility",
         "clang_cl::-fms-extensions",
         { public = true }
     )
 
-    -- add flags (clang-cl: disable warnings)
+    -- add flags (clang-cl: disable warnings) (public)
     add_cxxflags(
         "clang_cl::-Wno-delete-non-abstract-non-virtual-dtor",
         "clang_cl::-Wno-deprecated-volatile",
@@ -141,6 +150,7 @@ target("commonlib-shared", function()
         "clang_cl::-Wno-pragma-system-header-outside-header",
         "clang_cl::-Wno-reinterpret-base-class",
         "clang_cl::-Wno-switch",
+        "clang_cl::-Wno-unused-local-typedef",
         "clang_cl::-Wno-unused-private-field",
         { public = true }
     )
