Merge pull request #33 from predmond/master

src/benchmark.cc

@@ -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;

test/CMakeLists.txt

@@ -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)