Feature/boost 1.7.1 arango changes (#10296)

ObiWahn · web-flow · commit 6cfce93c5659 · 2019-10-22T10:30:53.000+02:00
* bump boost version * add missing header * try to fix _snprintf problem * Revert "try to fix _snprintf problem" This reverts commit 80cfef0. * another go at _snprintf
diff --git 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}")
 
diff --git 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
 
diff --git 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
@@ -82,6 +82,7 @@
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 
+#include <boost/core/demangle.hpp>
 using namespace arangodb;
 using namespace arangodb::tests;
 using namespace arangodb::tests::mocks;

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ target_link_libraries(arangodbtests`
`255`	`255`	`rocksdb`
`256`	`256`	`snappy`
`257`	`257`	`gtest`
	`258`	`+ boost_boost`
`258`	`259`	`)`
`259`	`260`
`260`	`261`	`if (USE_ENTERPRISE)`