diff --git a/test/unordered/serialization_tests.cpp b/test/unordered/serialization_tests.cpp index 42da2c8f..4bb32f06 100644 --- a/test/unordered/serialization_tests.cpp +++ b/test/unordered/serialization_tests.cpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -21,7 +22,11 @@ #include #include -#ifndef BOOST_NO_CXX11_HDR_RANDOM +#if defined(BOOST_NO_CXX11_HDR_RANDOM) || BOOST_WORKAROUND(BOOST_MSVC, < 1700) +#define BOOST_UNORDERED_TEST_USE_STD_RANDOM_SHUFFLE +#endif + +#ifndef BOOST_UNORDERED_TEST_USE_STD_RANDOM_SHUFFLE #include #endif @@ -71,10 +76,10 @@ namespace { ++first; } -#ifndef BOOST_NO_CXX11_HDR_RANDOM - std::shuffle(v.begin(), v.end(), std::mt19937(4213)); -#else +#ifdef BOOST_UNORDERED_TEST_USE_STD_RANDOM_SHUFFLE std::random_shuffle(v.begin(), v.end()); +#else + std::shuffle(v.begin(), v.end(), std::mt19937(4213)); #endif std::ostringstream oss;