Upgrade to C++17

2 files changed, 13 insertions, 12 deletions

diff --git a/source/test/btree_database_test.cpp b/source/test/btree_database_test.cpp
index 9b9bee4..09b4b16 100644
--- a/source/test/btree_database_test.cpp
+++ b/source/test/btree_database_test.cpp
@@ -101,25 +101,25 @@ namespace {
     db.open();
 
     // record writes/reads repeated writeRepeat times randomly each cycle
-    std::random_shuffle(keys.begin(), keys.end());
+    Random::shuffle(keys);
     putAll(db, keys);
 
     EXPECT_EQ(db.recordCount(), testCount);
 
-    std::random_shuffle(keys.begin(), keys.end());
+    Random::shuffle(keys);
     checkAll(db, keys);
 
     // Random reads/writes with randCount cycles...
     for (uint32_t i = 0; i < randCount; ++i) {
       List<uint32_t> keysTemp(keys.begin(), keys.begin() + keys.size() / 2);
 
-      std::random_shuffle(keysTemp.begin(), keysTemp.end());
+      Random::shuffle(keysTemp);
       removeAll(db, keysTemp);
 
-      std::random_shuffle(keysTemp.begin(), keysTemp.end());
+      Random::shuffle(keysTemp);
       putAll(db, keysTemp);
 
-      std::random_shuffle(keys.begin(), keys.end());
+      Random::shuffle(keys);
       checkAll(db, keys);
     }
 
@@ -128,7 +128,7 @@ namespace {
     // Random reads/writes/rollbacks with rollbackCount cycles...
     for (uint32_t i = 0; i < rollbackCount ; ++i) {
       List<uint32_t> keysTemp(keys.begin(), keys.begin() + keys.size() / 2);
-      std::random_shuffle(keysTemp.begin(), keysTemp.end());
+      Random::shuffle(keysTemp);
 
       removeAll(db, keysTemp);
       db.rollback();
@@ -193,7 +193,7 @@ TEST(BTreeDatabaseTest, Threading) {
     if (Random::randf() > 0.3)
       deleteKeySet.append(key);
   }
-  std::random_shuffle(writeKeySet.begin(), writeKeySet.end());
+  Random::shuffle(writeKeySet);
 
   {
     auto writer = Thread::invoke("databaseTestWriter",
diff --git a/source/test/btree_test.cpp b/source/test/btree_test.cpp
index aa413d6..2d22631 100644
--- a/source/test/btree_test.cpp
+++ b/source/test/btree_test.cpp
@@ -3,6 +3,7 @@
 #include "StarMap.hpp"
 #include "StarSet.hpp"
 #include "StarLexicalCast.hpp"
+#include "StarRandom.hpp"
 
 #include "gtest/gtest.h"
 
@@ -614,25 +615,25 @@ void testBTree(size_t maxIndexSize, size_t maxLeafSize) {
   }
 
   // record writes/reads repeated WriteRepeat times randomly each cycle
-  std::random_shuffle(keys.begin(), keys.end());
+  Random::shuffle(keys);
   putAll(db, keys);
 
   EXPECT_EQ(db.recordCount(), TestCount);
 
-  std::random_shuffle(keys.begin(), keys.end());
+  Random::shuffle(keys);
   checkAll(db, keys);
 
   // Random reads/writes with ShrinkCount cycles...
   for (size_t i = 0; i < ShrinkCount; ++i) {
-    std::random_shuffle(keys.begin(), keys.end());
+    Random::shuffle(keys);
     List<int> keysTemp = keys.slice(0, keys.size() / 2);
 
     removeAll(db, keysTemp);
 
-    std::random_shuffle(keysTemp.begin(), keysTemp.end());
+    Random::shuffle(keysTemp);
     putAll(db, keysTemp);
 
-    std::random_shuffle(keysTemp.begin(), keysTemp.end());
+    Random::shuffle(keysTemp);
     checkAll(db, keys);
   }