Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extended the range of a suppressed warning for MSVC (#10039)

This commit is contained in:
Tobias Gödderz 2019-09-20 13:09:34 +02:00 committed by Michael Hackstein
parent dd10909dfc
commit aa14af9ae0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Basics/ArangoGlobalContext.cpp
View File

@ -62,6 +62,13 @@ inline void ADB_WindowsExitFunction(int, void*) {}
#include <regex> #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;
using namespace arangodb::basics; using namespace arangodb::basics;
@ -204,14 +211,8 @@ ArangoGlobalContext::~ArangoGlobalContext() {
TRIAGENS_REST_SHUTDOWN; TRIAGENS_REST_SHUTDOWN;
ADB_WindowsExitFunction(_ret, nullptr); 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) { int ArangoGlobalContext::exit(int ret) {
_ret = ret; _ret = ret;
return _ret; return _ret;
@ -385,3 +386,7 @@ void ArangoGlobalContext::normalizePath(std::string& path, char const* whichPath
} }
} }
} }
#if (_MSC_VER >= 1)
#pragma warning(pop)
#endif