3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2025-01-14 18:07:59 +08:00
Code Issues Projects Releases Wiki Activity

std::random_shuffle is removed in current standard

Browse Source 
use <random> 's generator and std::shuffle instead
This commit is contained in:
denchat 2019-06-10 00:14:21 +07:00 committed by GitHub
parent 7247a823b7
commit 1312a46d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_xpath.cpp
View File

@ -10,6 +10,14 @@
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
// std::random_shuffle is deprecated in c++14, is removed in c++17.
# if defined(__cplusplus) && (__cplusplus >= 201402L)
# include <random>
# 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; using namespace pugi;
static void load_document_copy(xml_document& doc, const char_t* text) 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() | //@*")); xpath_node_set ns = doc.select_nodes(STR("//node() | //@*"));
std::vector<xpath_node> nsv(ns.begin(), ns.end()); std::vector<xpath_node> 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()); xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size());
copy.sort(); copy.sort();
@ -184,7 +192,7 @@ TEST(xpath_sort_random_large)
xpath_node_set ns = doc.select_nodes(STR("//node() | //@*")); xpath_node_set ns = doc.select_nodes(STR("//node() | //@*"));
std::vector<xpath_node> nsv(ns.begin(), ns.end()); std::vector<xpath_node> 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()); xpath_node_set copy(&nsv[0], &nsv[0] + nsv.size());
copy.sort(); copy.sort();