8000 Feature/boost 1.7.1 arango changes by ObiWahn · Pull Request #10296 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Feature/boost 1.7.1 arango changes #10296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

< 8000 div class="flex-shrink-0 mb-2 flex-self-start flex-md-self-center"> Merged
merged 5 commits into from
Oct 22, 2019
Merged

Feature/boost 1.7.1 arango changes #10296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
445dc28
bump boost version
ObiWahn Oct 21, 2019
ca6a520
add missing header
ObiWahn Oct 21, 2019
0263091
try to fix _snprintf problem
ObiWahn Oct 22, 2019
cb9fd3d
Revert "try to fix _snprintf problem"
ObiWahn Oct 22, 2019
55bd7b2
another go at _snprintf
ObiWahn Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdParty/boost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}")

Expand Down
3 changes: 3 additions & 0 deletions lib/Basics/operating-system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ target_link_libraries(arangodbtests
rocksdb
snappy
gtest
boost_boost
)

if (USE_ENTERPRISE)
Expand Down
1 change: 1 addition & 0 deletions tests/Mocks/Servers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0