From 445dc281703f152753b1a354753b429add864039 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Mon, 21 Oct 2019 17:50:19 +0200 Subject: [PATCH 1/5] bump boost version --- 3rdParty/boost/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/boost/CMakeLists.txt b/3rdParty/boost/CMakeLists.txt index 2f3ec0e66750..6d5399043fd1 100644 --- a/3rdParty/boost/CMakeLists.txt +++ b/3rdParty/boost/CMakeLists.txt @@ -1,7 +1,7 @@ project(boost) #the boost version must also be adjusted in the top-level CMakeLists.txt file -set(boost_version "1.69.0") +set(boost_version "1.17.0") set(BOOST_VERSION ${boost_version} PARENT_SCOPE) set(boost_src "${CMAKE_CURRENT_SOURCE_DIR}/${boost_version}") From ca6a5200bc56ea0a4e810b6967f58b66877d7fc1 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Mon, 21 Oct 2019 18:40:52 +0200 Subject: [PATCH 2/5] add missing header --- tests/CMakeLists.txt | 1 + tests/Mocks/Servers.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index dcc8f0e29c19..053a2a25df7b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -255,6 +255,7 @@ target_link_libraries(arangodbtests rocksdb snappy gtest + boost_boost ) if (USE_ENTERPRISE) diff --git a/tests/Mocks/Servers.cpp b/tests/Mocks/Servers.cpp index f7e6e6ee6b96..a3d6e433ed80 100644 --- a/tests/Mocks/Servers.cpp +++ b/tests/Mocks/Servers.cpp @@ -82,6 +82,7 @@ #include #include +#include using namespace arangodb; using namespace arangodb::tests; using namespace arangodb::tests::mocks; From 0263091b77b67273215355c5c8219557674ee818 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Tue, 22 Oct 2019 09:06:38 +0200 Subject: [PATCH 3/5] try to fix _snprintf problem --- .../boost/1.17.0/boost/system/detail/system_category_win32.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp b/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp index da256e1d705d..bc4253e5c849 100644 --- a/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp +++ b/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp @@ -35,7 +35,7 @@ inline char const * unknown_message_win32( int ev, char * buffer, std::size_t le # pragma warning( disable: 4996 ) # endif - _snprintf( buffer, len - 1, "Unknown error (%d)", ev ); + std::snprintf( buffer, len - 1, "Unknown error (%d)", ev ); buffer[ len - 1 ] = 0; return buffer; From cb9fd3dab5908fde9e639bc4c5f767a8a4f156d6 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Tue, 22 Oct 2019 09:46:09 +0200 Subject: [PATCH 4/5] Revert "try to fix _snprintf problem" This reverts commit 80cfef078a743ae3a6a07c7acc45dd5e7b68c1f5. --- .../boost/1.17.0/boost/system/detail/system_category_win32.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp b/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp index bc4253e5c849..da256e1d705d 100644 --- a/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp +++ b/3rdParty/boost/1.17.0/boost/system/detail/system_category_win32.hpp @@ -35,7 +35,7 @@ inline char const * unknown_message_win32( int ev, char * buffer, std::size_t le # pragma warning( disable: 4996 ) # endif - std::snprintf( buffer, len - 1, "Unknown error (%d)", ev ); + _snprintf( buffer, len - 1, "Unknown error (%d)", ev ); buffer[ len - 1 ] = 0; return buffer; From 55bd7b2d05a9f3673ce0199d328e370617610402 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Tue, 22 Oct 2019 10:01:35 +0200 Subject: [PATCH 5/5] another go at _snprintf --- lib/Basics/operating-system.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Basics/operating-system.h b/lib/Basics/operating-system.h index f1de864ec014..7f18a6846f8a 100644 --- a/lib/Basics/operating-system.h +++ b/lib/Basics/operating-system.h @@ -730,7 +730,10 @@ #define TRI_random ::rand #define TRI_srandom ::srand +#if ( defined(_MSC_VER) && _MSC_VER < 1900 ) || ( defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) ) #define snprintf _snprintf +#endif + #define strcasecmp _stricmp #define strncasecmp _strnicmp