Merge pull request #1242 from biddisco/mac_fixes

Mac fixes
STEllAR-GROUP · Sep 4, 2014 · 13dd1ee · 13dd1ee
2 parents 8136d19 + 0aa2523
commit 13dd1ee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 
 *.pyc
 build
+.DS_Store
diff --git a/hpx/parallel/util/partitioner.hpp b/hpx/parallel/util/partitioner.hpp
@@ -127,7 +127,7 @@ namespace hpx { namespace parallel { namespace util
             count -= test_chunk_size;
 
             // return chunk size which will create 80 microseconds of work
-            return t == 0 ? 0 : (std::min)(count, 80000 / t);
+            return t == 0 ? 0 : (std::min)(count, (std::size_t)(80000 / t));
         }
 
         template <typename ExPolicy, typename Result, typename F1,
@@ -376,7 +376,7 @@ namespace hpx { namespace parallel { namespace util
             count -= test_chunk_size;
 
             // return chunk size which will create 80 microseconds of work
-            return t == 0 ? 0 : (std::min)(count, 80000 / t);
+            return t == 0 ? 0 : (std::min)(count, (std::size_t)(80000 / t));
         }
 
         template <typename ExPolicy, typename Result, typename F1,

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -15,4 +15,5 @@ foreach(tool ${tools})
     SOURCES ${tool}.cpp ${${tool}}
     FOLDER "Tools/${tool}")
   add_hpx_pseudo_dependencies(tools ${tool}_exe)
+  target_link_libraries(${tool}_exe ${Boost_LIBRARIES})
 endforeach()