NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
jbfove 2020-07-22 19:07:49 +09:00 committed by GitHub
parent 23b9abd07a
commit 5650ce45a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlib/geometry/vector.h
View File

@ -14,6 +14,8 @@
#include <array>
#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
// 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
@ -1378,8 +1380,8 @@ namespace std
}
#if defined(_MSC_VER) && _MSC_VER < 1400
// turn this warning back on
#pragma warning(default:4805)
// restore warnings back to their previous settings
#pragma warning(pop)
#endif
#endif // DLIB_VECTOr_H_

8
dlib/matrix/matrix.h
View File

@ -25,6 +25,8 @@
#endif
#ifdef _MSC_VER
#pragma warning(push)
// Disable the following warnings for Visual Studio
// This warning is:
@ -2165,10 +2167,8 @@ namespace dlib
}
#ifdef _MSC_VER
// put warnings back to their default settings
#pragma warning(default : 4355)
#pragma warning(default : 4723)
#pragma warning(default : 4724)
// restore warnings back to their previous settings
#pragma warning(pop)
#endif
#endif // DLIB_MATRIx_