From 15d7164347404249542dc5ae75cfd37011aef7c3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 18 Mar 2024 21:05:07 +0100 Subject: [PATCH] Replace std::random_shuffle (removed in C++17). --- test/image_filename_sorter_test.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc index eb662a120..29b550753 100644 --- a/test/image_filename_sorter_test.cc +++ b/test/image_filename_sorter_test.cc @@ -28,9 +28,10 @@ #include "lib/image_filename_sorter.h" #include "lib/compose.hpp" #include +#include +#include -using std::random_shuffle; using std::sort; using std::vector; @@ -69,7 +70,11 @@ BOOST_AUTO_TEST_CASE (image_filename_sorter_test2) for (int i = 0; i < 100000; ++i) { paths.push_back(String::compose("some.filename.with.%1.number.tiff", i)); } - random_shuffle (paths.begin(), paths.end()); + + std::random_device rd; + std::mt19937 generator(rd()); + std::shuffle(paths.begin(), paths.end(), generator); + sort (paths.begin(), paths.end(), ImageFilenameSorter()); for (int i = 0; i < 100000; ++i) { BOOST_CHECK_EQUAL(paths[i].string(), String::compose("some.filename.with.%1.number.tiff", i)); -- 2.30.2