SERVER-35170 Add misc fixes to enable building in -std=c++17 mode

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/db/sorter/sorter_test.cpp b/src/mongo/db/sorter/sorter_test.cpp
index 3ba4e8a98c3..6fb550b24cd 100644
--- a/src/mongo/db/sorter/sorter_test.cpp
+++ b/src/mongo/db/sorter/sorter_test.cpp
@@ -39,6 +39,7 @@
 #include "mongo/db/service_context.h"
 #include "mongo/db/service_context_noop.h"
 #include "mongo/db/service_context_registrar.h"
+#include "mongo/platform/random.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/unittest/temp_dir.h"
 #include "mongo/unittest/unittest.h"
@@ -477,12 +478,12 @@ class Dupes : public Basic {
 template <bool Random = true>
 class LotsOfDataLittleMemory : public Basic {
 public:
-    LotsOfDataLittleMemory() : _array(new int[NUM_ITEMS]) {
+    LotsOfDataLittleMemory() : _array(new int[NUM_ITEMS]), _random(int64_t(time(0))) {
         for (int i = 0; i < NUM_ITEMS; i++)
             _array[i] = i;
 
         if (Random)
-            std::random_shuffle(_array.get(), _array.get() + NUM_ITEMS);
+            std::shuffle(_array.get(), _array.get() + NUM_ITEMS, _random.urbg());
     }
 
     SortOptions adjustSortOptions(SortOptions opts) {
@@ -516,6 +517,7 @@ public:
         MEM_LIMIT = 64 * 1024,
     };
     std::unique_ptr<int[]> _array;
+    PseudoRandom _random;
 };