From 1312a46d91623d7a970f8248b0655e7ac28a8463 Mon Sep 17 00:00:00 2001 From: denchat <19730041+denchat@users.noreply.github.com> Date: Mon, 10 Jun 2019 00:14:21 +0700 Subject: [PATCH] std::random_shuffle is removed in current standard use 's generator and std::shuffle instead --- tests/test_xpath.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/test_xpath.cpp b/tests/test_xpath.cpp index fe1e312..8ef8637 100644 --- a/tests/test_xpath.cpp +++ b/tests/test_xpath.cpp @@ -10,6 +10,14 @@ #include #include +// std::random_shuffle is deprecated in c++14, is removed in c++17. +# if defined(__cplusplus) && (__cplusplus >= 201402L) +# include +# define PUGIXML_SHUFFLE(rng) std::shuffle(rng.begin(), rng.end(), std::default_random_engine{std::random_device{}()}) +# else +# define PUGIXML_SHUFFLE(rng) std::random_shuffle(rng.begin(), rng.end()) +#endif + using namespace pugi; static void load_document_copy(xml_document& doc, const char_t* text) @@ -155,7 +163,7 @@ TEST(xpath_sort_random_medium) xpath_node_set ns = doc.select_nodes(STR("//node() | //@*")); std::vector nsv(ns.begin(), ns.end()); - std::random_shuffle(nsv.begin(), nsv.end()); + PUGIXML_SHUFFLE(nsv); xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size()); copy.sort(); @@ -184,7 +192,7 @@ TEST(xpath_sort_random_large) xpath_node_set ns = doc.select_nodes(STR("//node() | //@*")); std::vector nsv(ns.begin(), ns.end()); - std::random_shuffle(nsv.begin(), nsv.end()); + PUGIXML_SHUFFLE(nsv); xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size()); copy.sort();