simplified macro for enabling/disabling warnings

DmitriySalnikov · Jul 20, 2023 · 4aac723 · 4aac723
1 parent 0d45f2e
commit 4aac723
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 38 deletions.
diff --git a/src/asset_library_update_checker.cpp b/src/asset_library_update_checker.cpp
@@ -5,14 +5,14 @@
 
 #include "version.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/json.hpp>
 #include <godot_cpp/classes/project_settings.hpp>
 #include <godot_cpp/classes/scene_tree.hpp>
 #include <godot_cpp/classes/scene_tree_timer.hpp>
 #include <godot_cpp/classes/window.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 void AssetLibraryUpdateChecker::_bind_methods() {
 #define REG_CLASS_NAME AssetLibraryUpdateChecker

diff --git a/src/asset_library_update_checker.h b/src/asset_library_update_checker.h
@@ -5,10 +5,10 @@
 
 #include "utils.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/http_request.hpp>
 #include <godot_cpp/classes/ref_counted.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 using namespace godot;
 

diff --git a/src/colors.h b/src/colors.h
@@ -2,9 +2,9 @@
 
 #include "utils_compiler.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/variant/color.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 class Colors {
 public:

diff --git a/src/data_graphs.h b/src/data_graphs.h
@@ -3,11 +3,11 @@
 #include "circular_buffer.h"
 #include "colors.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/canvas_item.hpp>
 #include <godot_cpp/classes/font.hpp>
 #include <godot_cpp/classes/ref_counted.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <map>
 

diff --git a/src/debug_draw.cpp b/src/debug_draw.cpp
@@ -8,7 +8,7 @@
 #include "grouped_text.h"
 #include "utils.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/config_file.hpp>
 #include <godot_cpp/classes/dir_access.hpp>
 #include <godot_cpp/classes/file_access.hpp>
@@ -21,7 +21,7 @@ MSVC_WARNING_DISABLE(4244)
 #include <godot_cpp/classes/scene_tree.hpp>
 #include <godot_cpp/classes/standard_material3d.hpp>
 #include <godot_cpp/classes/window.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <limits.h>
 

diff --git a/src/debug_draw.h b/src/debug_draw.h
@@ -3,14 +3,14 @@
 #include "colors.h"
 #include "geometry_generators.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/camera3d.hpp> // TODO: need to be removed with vararg functions in release build.
 #include <godot_cpp/classes/canvas_item.hpp>
 #include <godot_cpp/classes/canvas_layer.hpp>
 #include <godot_cpp/classes/font.hpp>
 #include <godot_cpp/classes/ref_counted.hpp>
 #include <godot_cpp/classes/sub_viewport.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <memory>
 

diff --git a/src/debug_draw_config_2d.h b/src/debug_draw_config_2d.h
@@ -2,10 +2,10 @@
 
 #include "colors.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/font.hpp>
 #include <godot_cpp/classes/ref_counted.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 using namespace godot;
 

diff --git a/src/debug_draw_config_3d.h b/src/debug_draw_config_3d.h
@@ -2,9 +2,9 @@
 
 #include "colors.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/ref_counted.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 using namespace godot;
 

diff --git a/src/debug_geometry_container.cpp b/src/debug_geometry_container.cpp
@@ -6,12 +6,12 @@
 #include "draw_stats.h"
 #include "utils.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/main_loop.hpp>
 #include <godot_cpp/classes/scene_tree.hpp>
 #include <godot_cpp/classes/sub_viewport.hpp>
 #include <godot_cpp/classes/world3d.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <array>
 

diff --git a/src/debug_geometry_container.h b/src/debug_geometry_container.h
@@ -6,7 +6,7 @@
 #include "math_utils.h"
 #include "render_instances.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/array_mesh.hpp>
 #include <godot_cpp/classes/camera3d.hpp>
 #include <godot_cpp/classes/canvas_item.hpp>
@@ -19,7 +19,7 @@ MSVC_WARNING_DISABLE(4244)
 #include <godot_cpp/classes/rendering_server.hpp>
 #include <godot_cpp/classes/standard_material3d.hpp>
 #include <godot_cpp/classes/texture.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <map>
 

diff --git a/src/draw_cache.h b/src/draw_cache.h
@@ -1,11 +1,11 @@
 #pragma once
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/font.hpp>
 #include <godot_cpp/classes/ref.hpp>
 #include <godot_cpp/godot.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 using namespace godot;
 

diff --git a/src/draw_stats.h b/src/draw_stats.h
@@ -2,9 +2,9 @@
 
 #include "utils_compiler.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/ref_counted.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 using namespace godot;
 

diff --git a/src/geometry_generators.h b/src/geometry_generators.h
@@ -2,10 +2,10 @@
 
 #include "utils_compiler.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/godot.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <array>
 #include <vector>

diff --git a/src/grouped_text.h b/src/grouped_text.h
@@ -3,11 +3,11 @@
 
 #include "utils_compiler.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/canvas_item.hpp>
 #include <godot_cpp/classes/font.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <functional>
 #include <memory>

diff --git a/src/math_utils.h b/src/math_utils.h
@@ -2,10 +2,10 @@
 
 #include "utils_compiler.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/godot.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <vector>
 

diff --git a/src/render_instances.cpp b/src/render_instances.cpp
@@ -4,12 +4,12 @@
 
 #include "draw_stats.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/mesh.hpp>
 #include <godot_cpp/classes/multi_mesh.hpp>
 #include <godot_cpp/classes/texture.hpp>
 #include <godot_cpp/classes/time.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 template <class T, size_t _TStepSize>
 struct TempBigBuffer {

diff --git a/src/render_instances.h b/src/render_instances.h
@@ -5,9 +5,9 @@
 #include "math_utils.h"
 #include "utils.h"
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/array_mesh.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #include <array>
 

diff --git a/src/utils.h b/src/utils.h
@@ -14,7 +14,7 @@
 #include <unordered_set>
 #include <vector>
 
-MSVC_WARNING_DISABLE(4244)
+GODOT_WARNING_DISABLE()
 #include <godot_cpp/classes/engine.hpp>
 #include <godot_cpp/classes/node.hpp>
 #include <godot_cpp/core/binder_common.hpp>
@@ -23,7 +23,7 @@ MSVC_WARNING_DISABLE(4244)
 #include <godot_cpp/godot.hpp>
 #include <godot_cpp/variant/builtin_types.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
-MSVC_WARNING_RESTORE(4244)
+GODOT_WARNING_RESTORE()
 
 #if REAL_T_IS_DOUBLE
 typedef godot::PackedFloat64Array PackedRealArray;

diff --git a/src/utils_compiler.h b/src/utils_compiler.h
@@ -17,15 +17,21 @@
 #define EXPAND_MACRO(x)
 #endif
 
-// 
 #if _MSC_VER
 
+#define GODOT_WARNING_DISABLE() \
+	__pragma(warning(disable : 4244 26451 26495))
+#define GODOT_WARNING_RESTORE() \
+	__pragma(warning(default : 4244 26451 26495))
+
 #define MSVC_WARNING_DISABLE(n) __pragma(warning(disable \
 												 : n))
 #define MSVC_WARNING_RESTORE(n) __pragma(warning(default \
 												 : n))
 
 #else
+#define GODOT_WARNING_DISABLE(n)
+#define GODOT_WARNING_RESTORE(n)
 #define MSVC_WARNING_DISABLE(n)
 #define MSVC_WARNING_RESTORE(n)
-#endif
+#endif