#ifdef out random_shuffle deprecated in later c++

STEllAR-GROUP · Dec 11, 2017 · 04ea962 · 04ea962
1 parent a0d73d2
commit 04ea962
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp b/tests/performance/local/hpx_heterogeneous_timed_task_spawn.cpp
@@ -18,6 +18,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include <utility>
 
 #include "worker_timed.hpp"
 
@@ -183,10 +184,16 @@ int hpx_main(
             payloads.push_back(payload);
         }
 
+#if defined(HPX_HAVE_CXX11_STD_SHUFFLE)
+        std::random_device random_device;
+        std::mt19937 generator(random_device());
+        std::shuffle(payloads.begin(), payloads.end(), std::move(generator));
+#else
         // Randomly shuffle the entire sequence to deal with drift.
         using hpx::util::placeholders::_1;
         std::random_shuffle(payloads.begin(), payloads.end(),
             hpx::util::bind(&shuffler, std::ref(prng), _1));
+#endif
 
         ///////////////////////////////////////////////////////////////////////
         // Validate the payloads.

diff --git a/tests/performance/local/print_heterogeneous_payloads.cpp b/tests/performance/local/print_heterogeneous_payloads.cpp
@@ -20,6 +20,7 @@
 #include <random>
 #include <stdexcept>
 #include <vector>
+#include <utility>
 
 using boost::program_options::variables_map;
 using boost::program_options::options_description;
@@ -137,8 +138,14 @@ int app_main(
     }
 
     // Randomly shuffle the entire sequence to deal with drift.
+#if defined(HPX_HAVE_CXX11_STD_SHUFFLE)
+    std::random_device random_device;
+    std::mt19937 generator(random_device());
+    std::shuffle(payloads.begin(), payloads.end(), std::move(generator));
+#else
     std::random_shuffle(payloads.begin(), payloads.end(),
         boost::bind(&shuffler, std::ref(prng), _1));
+#endif
 
     ///////////////////////////////////////////////////////////////////////
     // Validate the payloads.

diff --git a/tests/performance/local/qthreads_heterogeneous_timed_task_spawn.cpp b/tests/performance/local/qthreads_heterogeneous_timed_task_spawn.cpp
@@ -45,6 +45,7 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
+#include <utility>
 
 #include <qthread/qthread.h>
 
@@ -216,9 +217,15 @@ int qthreads_main(
         }
 
         // Randomly shuffle the entire sequence to deal with drift.
+#if defined(HPX_HAVE_CXX11_STD_SHUFFLE)
+        std::random_device random_device;
+        std::mt19937 generator(random_device());
+        std::shuffle(payloads.begin(), payloads.end(), std::move(generator));
+#else
         using hpx::util::placeholders::_1;
         std::random_shuffle(payloads.begin(), payloads.end(),
             hpx::util::bind(&shuffler, std::ref(prng), _1));
+#endif
 
         ///////////////////////////////////////////////////////////////////////
         // Validate the payloads.