Merge remote-tracking branch 'origin/develop' into method_missing

2015-04-22 07:29:46 -06:00
parent 90102cebd7 0f4bd2b889
commit f3943f215f
9 changed files with 89 additions and 69 deletions
--- a/unittests/multithreaded_test.cpp
+++ b/unittests/multithreaded_test.cpp
@@ -68,7 +68,9 @@ int main()
  std::vector<std::shared_ptr<std::thread> > threads;

  // Ensure at least two, but say only 7 on an 8 core processor
-  int num_threads = std::max(std::thread::hardware_concurrency() - 1, 2u);
+  int num_threads = std::max(static_cast<int>(std::thread::hardware_concurrency()) - 1, 2);
+
+  std::cout << "Num threads: " << num_threads << '\n';

  for (int i = 0; i < num_threads; ++i)
  {