Merge pull request #1706 from STEllAR-GROUP/fixing_1705

Command line option --hpx:cores does not work as expected
STEllAR-GROUP · Aug 10, 2015 · 702e51e · 702e51e
2 parents 9806a56 + b484bc6
commit 702e51e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/runtime/threads/policies/affinity_data.cpp b/src/runtime/threads/policies/affinity_data.cpp
@@ -120,7 +120,8 @@ namespace hpx { namespace threads { namespace policies { namespace detail
         std::vector<std::size_t>::iterator it =
             std::unique(cores.begin(), cores.end());
 
-        return std::distance(cores.begin(), it);
+        std::size_t num_unique_cores = std::distance(cores.begin(), it);
+        return (std::max)(num_unique_cores, max_cores);
     }
 
     // means of adding a processing unit after initialization