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

Merge pull request #33 from predmond/master 

fix building on ubuntu
This commit is contained in:
Dominic Hamon 2014-07-23 09:01:16 -07:00
parent 6a6fc70cf0 52b3004ae3
commit 9f01575ffa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/benchmark.cc
View File

@ -345,7 +345,7 @@ int BenchmarkFamilies::AddBenchmark(Benchmark* family) {
mutex_lock l(&benchmark_mutex);
// This loop attempts to reuse an entry that was previously removed to avoid
// unncessary growth of the vector.
for (int index = 0; index < families_.size(); ++index) {
for (size_t index = 0; index < families_.size(); ++index) {
if (families_[index] == nullptr) {
families_[index] = family;
return index;

2
test/CMakeLists.txt
View File

@ -4,5 +4,5 @@ target_link_libraries(benchmark_test benchmark ${CMAKE_THREAD_LIBS_INIT})
# Test harness for regex wrapper
add_executable(re_test ${RE_FILES} "re_test.cc")
target_link_libraries(re_test benchmark_re ${CMAKE_THREAD_LIBS_INIT} gtest gtest_main)
target_link_libraries(re_test benchmark_re gtest gtest_main ${CMAKE_THREAD_LIBS_INIT})
add_test(regex re_test)