dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58 from google/zero_null 

Fix #50 by using nullptr and adding stricter warning.
This commit is contained in:
Chris Kennelly 2014-10-18 15:33:40 -07:00
parent 5f31f0dca2 e6107a781c
commit 8eac5dc328
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -37,6 +37,7 @@ add_cxx_compiler_flag(-Wall)
add_cxx_compiler_flag(-Wshadow) add_cxx_compiler_flag(-Wshadow)
add_cxx_compiler_flag(-Werror) add_cxx_compiler_flag(-Werror)
add_cxx_compiler_flag(-pedantic-errors) add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-Wzero-as-null-pointer-constant)
# Release flags # Release flags
add_cxx_compiler_flag(-fno-strict-aliasing RELEASE) add_cxx_compiler_flag(-fno-strict-aliasing RELEASE)

11
cmake/CXXFeatureCheck.cmake
View File

@ -22,13 +22,18 @@ function(cxx_feature_check FILE)
string(TOUPPER ${FILE} VAR) string(TOUPPER ${FILE} VAR)
string(TOUPPER "HAVE_${VAR}" FEATURE) string(TOUPPER "HAVE_${VAR}" FEATURE)
message("-- Performing Test ${FEATURE}") message("-- Performing Test ${FEATURE}")
try_run(RUN_${FEATURE} COMPILE_${FEATURE} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp) try_run(RUN_${FEATURE} COMPILE_${FEATURE}
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${FILE}.cpp)
if(RUN_${FEATURE} EQUAL 0) if(RUN_${FEATURE} EQUAL 0)
message("-- Performing Test ${FEATURE} -- Success") message("-- Performing Test ${FEATURE} -- success")
set(HAVE_${VAR} 1 PARENT_SCOPE) set(HAVE_${VAR} 1 PARENT_SCOPE)
add_definitions(-DHAVE_${VAR}) add_definitions(-DHAVE_${VAR})
else() else()
message("-- Performing Test ${FEATURE} -- Failed") if(NOT COMPILE_${FEATURE})
message("-- Performing Test ${FEATURE} -- failed to compile")
else()
message("-- Performing Test ${FEATURE} -- compiled but failed to run")
endif()
endif() endif()
endfunction() endfunction()

2
cmake/gnu_posix_regex.cpp
View File

@ -7,6 +7,6 @@ int main() {
if (ec != 0) { if (ec != 0) {
return ec; return ec;
} }
return regexec(&re, str.c_str(), 0, NULL, 0) ? -1 : 0; return regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
} }

2
cmake/posix_regex.cpp
View File

@ -7,6 +7,6 @@ int main() {
if (ec != 0) { if (ec != 0) {
return ec; return ec;
} }
return regexec(&re, str.c_str(), 0, NULL, 0) ? -1 : 0; return regexec(&re, str.c_str(), 0, nullptr, 0) ? -1 : 0;
} }

4
cmake/std_regex.cpp
View File

@ -2,7 +2,9 @@
#include <string> #include <string>
int main() { int main() {
const std::string str = "test0159"; const std::string str = "test0159";
const std::regex re("^[a-z]+[0-9]+$", std::regex_constants::extended | std::regex_constants::nosubs); const std::regex re(
"^[a-z]+[0-9]+$",
std::regex_constants::extended | std::regex_constants::nosubs);
return std::regex_search(str, re) ? 0 : -1; return std::regex_search(str, re) ? 0 : -1;
} }