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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Kaveh Vahedipour 2017-01-10 15:37:16 +01:00
parent edac0586ab 8875afc1d5
commit dc3772ea84
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -502,6 +502,18 @@ if (USE_FAILURE_TESTS)
add_definitions("-DARANGODB_ENABLE_FAILURE_TESTS=1") add_definitions("-DARANGODB_ENABLE_FAILURE_TESTS=1")
endif () endif ()
################################################################################
## LIBRARY RESOLV
################################################################################
if (NOT WINDOWS)
set(SYS_LIBS ${SYS_LIBS} resolv)
if (NOT DARWIN)
set(SYS_LIBS ${SYS_LIBS} rt)
endif ()
endif ()
################################################################################ ################################################################################
## JEMALLOC ## JEMALLOC
################################################################################ ################################################################################
@ -535,7 +547,7 @@ return 0; }"
try_compile(HAS_PROPER_STATIC_JEMALLOC try_compile(HAS_PROPER_STATIC_JEMALLOC
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${TSTSRC} ${TSTSRC}
LINK_LIBRARIES "jemalloc.a" "pthread" LINK_LIBRARIES "jemalloc.a" "pthread" ${SYS_LIBS}
) )
if (USE_JEMALLOC AND NOT HAS_PROPER_STATIC_JEMALLOC) if (USE_JEMALLOC AND NOT HAS_PROPER_STATIC_JEMALLOC)
message(FATAL_ERROR "the static system jemalloc isn't suitable! Recompile with the current compiler or disable using `-DCMAKE_CXX_FLAGS=-no-pie -DCMAKE_C_FLAGS=-no-pie`") message(FATAL_ERROR "the static system jemalloc isn't suitable! Recompile with the current compiler or disable using `-DCMAKE_CXX_FLAGS=-no-pie -DCMAKE_C_FLAGS=-no-pie`")
@ -577,18 +589,6 @@ if (${USE_JEMALLOC} AND ${USE_TCMALLOC})
MESSAGE(FATAL_ERROR " you mustn't demand for tcmalloc and jemalloc at the same time!") MESSAGE(FATAL_ERROR " you mustn't demand for tcmalloc and jemalloc at the same time!")
endif() endif()
################################################################################
## LIBRARY RESOLV
################################################################################
if (NOT WINDOWS)
set(SYS_LIBS ${SYS_LIBS} resolv)
if (NOT DARWIN)
set(SYS_LIBS ${SYS_LIBS} rt)
endif ()
endif ()
################################################################################ ################################################################################
## FLAGS ## FLAGS
################################################################################ ################################################################################

6
arangod/Aql/AqlValue.cpp
View File

@ -34,6 +34,8 @@
#include <velocypack/Slice.h> #include <velocypack/Slice.h>
#include <velocypack/velocypack-aliases.h> #include <velocypack/velocypack-aliases.h>
#include <array>
using namespace arangodb; using namespace arangodb;
using namespace arangodb::aql; using namespace arangodb::aql;
@ -155,7 +157,7 @@ bool AqlValue::isArray() const noexcept {
} }
} }
std::array<std::string const, 8> AqlValue::typeStrings = { std::array<std::string const, 8> AqlValue::typeStrings = { {
"none", "none",
"null", "null",
"bool", "bool",
@ -163,7 +165,7 @@ std::array<std::string const, 8> AqlValue::typeStrings = {
"string", "string",
"object", "object",
"array", "array",
"unknown"}; "unknown"} };
std::string const & AqlValue::getTypeString() const noexcept { std::string const & AqlValue::getTypeString() const noexcept {
if(isNone()) { if(isNone()) {