Unverified Commit 5650ce45 authored by jbfove's avatar jbfove Committed by GitHub
Browse files

Fix restoration of MSVC warnings in public headers (#2135)

Previously they were restored to default values, which had the effect of negating the current setting of the calling code (whether set in the compiler options or by pragma previously)
parent 23b9abd0
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <array> #include <array>
#if defined(_MSC_VER) && _MSC_VER < 1400 #if defined(_MSC_VER) && _MSC_VER < 1400
#pragma warning(push)
// Despite my efforts to disabuse visual studio of its usual nonsense I can't find a // Despite my efforts to disabuse visual studio of its usual nonsense I can't find a
// way to make this warning go away without just disabling it. This is the warning: // way to make this warning go away without just disabling it. This is the warning:
// dlib\geometry\vector.h(129) : warning C4805: '==' : unsafe mix of type 'std::numeric_limits<_Ty>::is_integer' and type 'bool' in operation // dlib\geometry\vector.h(129) : warning C4805: '==' : unsafe mix of type 'std::numeric_limits<_Ty>::is_integer' and type 'bool' in operation
...@@ -1378,8 +1380,8 @@ namespace std ...@@ -1378,8 +1380,8 @@ namespace std
} }
#if defined(_MSC_VER) && _MSC_VER < 1400 #if defined(_MSC_VER) && _MSC_VER < 1400
// turn this warning back on // restore warnings back to their previous settings
#pragma warning(default:4805) #pragma warning(pop)
#endif #endif
#endif // DLIB_VECTOr_H_ #endif // DLIB_VECTOr_H_
......
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push)
// Disable the following warnings for Visual Studio // Disable the following warnings for Visual Studio
// This warning is: // This warning is:
...@@ -2165,10 +2167,8 @@ namespace dlib ...@@ -2165,10 +2167,8 @@ namespace dlib
} }
#ifdef _MSC_VER #ifdef _MSC_VER
// put warnings back to their default settings // restore warnings back to their previous settings
#pragma warning(default : 4355) #pragma warning(pop)
#pragma warning(default : 4723)
#pragma warning(default : 4724)
#endif #endif
#endif // DLIB_MATRIx_ #endif // DLIB_MATRIx_
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment