Disable warning C5054 introduced in VS 2019 16.2 (#2983)

ago%!(EXTRA string=5 years) · 2478dbfdb7
parent 6c00d1916e
commit 2478dbfdb7
2 changed files with 8 additions and 2 deletions
--- a/imgui.cpp
+++ b/imgui.cpp
@ -812,6 +812,9 @@ CODE
 #ifdef _MSC_VER
 #pragma warning (disable: 4127)     // condition expression is constant
 #pragma warning (disable: 4996)     // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later
+#pragma warning (disable: 5054)     // operator '|': deprecated between enumerations of different types
+#endif
 #endif

 // Clang/GCC warnings with -Weverything
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp
@ -47,8 +47,11 @@ Index of this file:

 // Visual Studio warnings
 #ifdef _MSC_VER
-#pragma warning (disable: 4127) // condition expression is constant
-#pragma warning (disable: 4996) // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#pragma warning (disable: 4127)     // condition expression is constant
+#pragma warning (disable: 4996)     // 'This function or variable may be unsafe': strcpy, strdup, sprintf, vsnprintf, sscanf, fopen
+#if defined(_MSC_VER) && _MSC_VER >= 1922 // MSVC 2019 16.2 or later
+#pragma warning (disable: 5054)     // operator '|': deprecated between enumerations of different types
+#endif
 #endif

 // Clang/GCC warnings with -Weverything