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

Bug fix/wintendo compile sequence (#9295) 

* move snappy up

* Fix compile warning with MSVC (#9291)

* one more warning

* use right type

* only define variable if we actually use it in the code

* only define variable if we actually use it in the code undo

* use right type
This commit is contained in:
Wilfried Goesgens 2019-06-19 12:00:48 +02:00 committed by Frank Celler
parent 89aa67dcf4
commit 42e3dcf5a1
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
3rdParty/CMakeLists.txt vendored
View File

@ -15,6 +15,28 @@ remove_definitions("-DUSE_ENTERPRISE=1")
set(SKIP_INSTALL_ALL ON)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib-1.2.11)
################################################################################
## SNAPPY
################################################################################
set(SNAPPY_VERSION "1.1.7")
set(SNAPPY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/snappy/snappy-${SNAPPY_VERSION}")
set(SNAPPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/snappy/snappy-${SNAPPY_VERSION}")
set(SNAPPY_LIB "snappy")
set(SNAPPY_LIB "${SNAPPY_LIB}" PARENT_SCOPE)
add_subdirectory(${SNAPPY_SOURCE_DIR} EXCLUDE_FROM_ALL)
################################################################################
## JEMALLOC
################################################################################
if (USE_JEMALLOC)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/jemalloc)
include_directories(SYSTEM "${JEMALLOC_HOME}/include")
link_directories("${JEMALLOC_HOME}/lib")
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_LIB} PARENT_SCOPE)
endif ()
################################################################################
## V8 and ICU
################################################################################
@ -227,28 +249,6 @@ set(CURL_SRC_DIR "${CURL_SRC_DIR}" PARENT_SCOPE)
set(CURL_CONFIG_HAS_BEEN_RUN_BEFORE true PARENT_SCOPE)
################################################################################
## SNAPPY
################################################################################
set(SNAPPY_VERSION "1.1.7")
set(SNAPPY_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/snappy/snappy-${SNAPPY_VERSION}")
set(SNAPPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/snappy/snappy-${SNAPPY_VERSION}")
set(SNAPPY_LIB "snappy")
set(SNAPPY_LIB "${SNAPPY_LIB}" PARENT_SCOPE)
add_subdirectory(${SNAPPY_SOURCE_DIR} EXCLUDE_FROM_ALL)
################################################################################
## JEMALLOC
################################################################################
if (USE_JEMALLOC)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/jemalloc)
include_directories(SYSTEM "${JEMALLOC_HOME}/include")
link_directories("${JEMALLOC_HOME}/lib")
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_LIB} PARENT_SCOPE)
endif ()
################################################################################
## ROCKSDB
################################################################################

6
tests/Aql/ExecutorTestHelper.cpp
View File

@ -35,5 +35,9 @@ std::ostream& arangodb::tests::aql::operator<<(std::ostream& stream,
case ExecutorCall::EXPECTED_NR_ROWS:
return "EXPECTED_NR_ROWS";
}
}();
// The control flow cannot reach this. It is only here to make MSVC happy,
// which is unable to figure out that the switch above is complete.
TRI_ASSERT(false);
THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL_AQL);
}();
}

4
tests/Aql/VelocyPackHelper.cpp
View File

@ -80,10 +80,10 @@ std::vector<SharedAqlItemBlockPtr> arangodb::tests::vPackToAqlItemBlocks(
if (outer.length() == 0) {
return {};
}
size_t const nrRegs = [&]() {
RegisterCount const nrRegs = [&]() {
VPackSlice firstRow(outer[0]);
TRI_ASSERT(firstRow.isArray());
return firstRow.length();
return static_cast<RegisterCount>(firstRow.length());
}();
auto wrap = [](VPackSlice slice) -> VPackBufferPtr {