Skip to content

GitLab

Unverified Commit 8b465291 authored by Adrià Arrufat's avatar Adrià Arrufat Committed by GitHub
Browse files

Fix MSVC pragma warnings with other compilers (#2483)

parent a6f29d41
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
dlib/geometry/rectangle.h
View file @ 8b465291
...@@ -750,8 +750,10 @@ namespace dlib ...@@ -750,8 +750,10 @@ namespace dlib
// Circumvent what appears to be a bug in Visual Studio 2019's optimizer // Circumvent what appears to be a bug in Visual Studio 2019's optimizer
// (see: https://forum.juce.com/t/warning-in-the-lastest-vs2019/38267) // (see: https://forum.juce.com/t/warning-in-the-lastest-vs2019/38267)
#if defined (_MSVC_VER)
#pragma warning ( push ) #pragma warning ( push )
#pragma warning ( disable: 4723 ) #pragma warning ( disable: 4723 )
#endif
inline rectangle set_rect_area ( inline rectangle set_rect_area (
const rectangle& rect, const rectangle& rect,
unsigned long area unsigned long area
...@@ -772,7 +774,9 @@ namespace dlib ...@@ -772,7 +774,9 @@ namespace dlib
return centered_rect(rect, (long)std::round(rect.width()*scale), (long)std::round(rect.height()*scale)); return centered_rect(rect, (long)std::round(rect.width()*scale), (long)std::round(rect.height()*scale));
} }
} }
#if defined (_MSVC_VER)
#pragma warning ( pop ) #pragma warning ( pop )
#endif
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
......
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