From ed7e382c76fcc05c512b20b035c68f61f1f8bb49 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Tue, 18 Dec 2018 17:08:37 +0100
Subject: [PATCH] [T] Replace std::random_shuffle with std::shuffle.
The latter takes a random generator while the former uses
std::rand implicitly.
The std::random_shuffle was marked deprecated and is removed
from the c++17.
---
Tests/BaseLib/TestAlgorithm.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Tests/BaseLib/TestAlgorithm.cpp b/Tests/BaseLib/TestAlgorithm.cpp
index 9fa7d72abe6..d102cb726cc 100644
--- a/Tests/BaseLib/TestAlgorithm.cpp
+++ b/Tests/BaseLib/TestAlgorithm.cpp
@@ -9,6 +9,7 @@
#include <algorithm>
#include <numeric>
+#include <random>
#include <vector>
#include <gtest/gtest.h>
@@ -19,12 +20,13 @@ TEST(BaseLibAlgorithm, testreorderVector)
{
const std::size_t size = 100;
std::vector<double> vec(size);
- std::generate(vec.begin(), vec.end(), std::rand);
+ std::default_random_engine random_engine;
+ std::generate(vec.begin(), vec.end(), random_engine);
std::vector<double> vec0 = vec;
std::vector<int> order(size);
std::iota(order.begin(), order.end(), 0);
- std::random_shuffle(order.begin(), order.end());
+ std::shuffle(order.begin(), order.end(), random_engine);
BaseLib::reorderVector(vec, order);
--
GitLab