From 4c44c3ecf85d422a043b9e0425e359167ead43bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 11 Jan 2018 19:42:16 +0100
Subject: [PATCH] external: fix build of a test on WinRT with MSVC 2017.

It enables deprecation-warning-is-error by default and the deprecation
warnings in the std::optional compatibility test were not properly
ignored.
---
 .../Optional/Test/StdOptionalTest.cpp            | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp b/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
index 1458ded27..3bab115a0 100644
--- a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
+++ b/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
@@ -23,6 +23,13 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+/* Needs to be here otherwise the deprecation warning inside OptionalConverter
+   is not ignored */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4996)
+#endif
+
 #include <memory>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/TestSuite/Tester.h>
@@ -45,9 +52,6 @@ StdOptionalTest::StdOptionalTest() {
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#elif defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable: 4996)
 #endif
 void StdOptionalTest::conversion() {
     Debug{} << "Using C++ version" << CORRADE_CXX_STANDARD;
@@ -75,10 +79,12 @@ void StdOptionalTest::conversion() {
 }
 #ifdef __GNUC__
 #pragma GCC diagnostic pop
-#elif defined(_MSC_VER)
-#pragma warning(pop)
 #endif
 
 }}
 
 CORRADE_TEST_MAIN(Magnum::Test::StdOptionalTest)
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif