From 9f755bd429be7cb52c16c62025712096a50063ff 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 16:27:19 +0100
Subject: [PATCH] wip

---
 .../Optional/Test/StdOptionalTest.cpp         | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp b/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
index ca4827cfe6..963367ef7b 100644
--- a/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
+++ b/src/MagnumExternal/Optional/Test/StdOptionalTest.cpp
@@ -23,6 +23,13 @@
     DEALINGS IN THE SOFTWARE.
 */
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#elif defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable: 4996)
+#endif
 #include <memory>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/TestSuite/Tester.h>
@@ -42,15 +49,7 @@ StdOptionalTest::StdOptionalTest() {
     addTests({&StdOptionalTest::conversion});
 }
 
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
 void StdOptionalTest::conversion() {
-    #ifdef _MSC_VER
-    #pragma warning(push)
-    #pragma warning(disable: 4996)
-    #endif
     Debug{} << "Using C++ version" << CORRADE_CXX_STANDARD;
     #ifdef _MAGNUM_HAS_STD_OPTIONAL
     Debug{} << "Using a conversion to std::optional, C++17 should be present";
@@ -73,14 +72,13 @@ void StdOptionalTest::conversion() {
     Containers::Optional<std::unique_ptr<int>> c{std::unique_ptr<int>{new int{7}}};
     std::optional<std::unique_ptr<int>> sc = std::move(c);
     CORRADE_COMPARE(**sc, 7);
-    #ifdef _MSC_VER
-    #pragma warning(pop)
-    #endif
 }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
 
 }}
 
 CORRADE_TEST_MAIN(Magnum::Test::StdOptionalTest)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#elif defined(_MSC_VER)
+#pragma warning(pop)
+#endif