From aa14af9ae01cfa5ac689b128ca7656e2d5c92b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20G=C3=B6dderz?= <tobias@arangodb.com>
Date: Fri, 20 Sep 2019 13:09:34 +0200
Subject: [PATCH] Extended the range of a suppressed warning for MSVC (#10039)

---
 lib/Basics/ArangoGlobalContext.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/Basics/ArangoGlobalContext.cpp b/lib/Basics/ArangoGlobalContext.cpp
index d04401137f..346592fee0 100644
--- a/lib/Basics/ArangoGlobalContext.cpp
+++ b/lib/Basics/ArangoGlobalContext.cpp
@@ -62,6 +62,13 @@ inline void ADB_WindowsExitFunction(int, void*) {}
 
 #include <regex>
 
+#if (_MSC_VER >= 1)
+// Disable a warning caused by the call to ADB_WindowsExitFunction() in
+// ~ArangoGlobalContext().
+#pragma warning(push)
+#pragma warning(disable : 4722)  // destructor never returns, potential memory leak
+#endif
+
 using namespace arangodb;
 using namespace arangodb::basics;
 
@@ -204,14 +211,8 @@ ArangoGlobalContext::~ArangoGlobalContext() {
 
   TRIAGENS_REST_SHUTDOWN;
   ADB_WindowsExitFunction(_ret, nullptr);
-#if (_MSC_VER >= 1)
-#pragma warning(push)
-#pragma warning(disable : 4722)  // destructor never returns, potential memory leak
-#endif
 }
-#if (_MSC_VER >= 1)
-#pragma warning(pop)
-#endif
+
 int ArangoGlobalContext::exit(int ret) {
   _ret = ret;
   return _ret;
@@ -385,3 +386,7 @@ void ArangoGlobalContext::normalizePath(std::string& path, char const* whichPath
     }
   }
 }
+
+#if (_MSC_VER >= 1)
+#pragma warning(pop)
+#endif