jasder
/
simdjson
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Merge branch 'master' into issue99

This commit is contained in:
Daniel Lemire 2019-05-16 15:03:26 -04:00
parent 1d531a9600 14cd1f7a0b
commit e4bae80f9b
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/simdjson/portability.h
View File

@ -19,11 +19,11 @@ static inline bool mul_overflow(uint64_t value1, uint64_t value2, uint64_t *resu
} }
static inline int trailingzeroes(uint64_t input_num) { static inline int trailingzeroes(uint64_t input_num) {
return _tzcnt_u64(input_num); return static_cast<int>(_tzcnt_u64(input_num));
} }
static inline int leadingzeroes(uint64_t input_num) { static inline int leadingzeroes(uint64_t input_num) {
return _lzcnt_u64(input_num); return static_cast<int>(_lzcnt_u64(input_num));
} }
static inline int hamming(uint64_t input_num) { static inline int hamming(uint64_t input_num) {

7
tools/cmake/FindCTargets.cmake
View File

@ -1,8 +1,3 @@
if (CMAKE_VERSION VERSION_GREATER 3.0.0)
cmake_policy(VERSION 3.0.0)
endif ()
function(add_cpp_test TEST_NAME) function(add_cpp_test TEST_NAME)
add_executable(${TEST_NAME} ${TEST_NAME}.cpp) add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
target_link_libraries(${TEST_NAME} ${SIMDJSON_LIB_NAME}) target_link_libraries(${TEST_NAME} ${SIMDJSON_LIB_NAME})
@ -17,4 +12,4 @@ endfunction(add_cpp_benchmark)
function(add_cpp_tool TOOL_NAME) function(add_cpp_tool TOOL_NAME)
add_executable(${TOOL_NAME} ${TOOL_NAME}.cpp) add_executable(${TOOL_NAME} ${TOOL_NAME}.cpp)
target_link_libraries(${TOOL_NAME} ${SIMDJSON_LIB_NAME}) target_link_libraries(${TOOL_NAME} ${SIMDJSON_LIB_NAME})
endfunction(add_cpp_tool) endfunction(add_cpp_tool)