Merge pull request #5978

77afe91 unit_tests: fix build with boost 1.69 (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-10 20:56:50 -05:00
commit d66db18c06
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -893,7 +893,8 @@ TEST(dandelionpp_map, empty)
TEST(dandelionpp_map, zero_stems) TEST(dandelionpp_map, zero_stems)
{ {
std::vector<boost::uuids::uuid> connections{6}; std::vector<boost::uuids::uuid> connections{6};
std::generate(connections.begin(), connections.end(), boost::uuids::random_generator{}); for (auto &c: connections)
c = boost::uuids::random_generator{}();
net::dandelionpp::connection_map mapper{connections, 0}; net::dandelionpp::connection_map mapper{connections, 0};
EXPECT_EQ(mapper.begin(), mapper.end()); EXPECT_EQ(mapper.begin(), mapper.end());
@ -917,7 +918,8 @@ TEST(dandelionpp_map, zero_stems)
TEST(dandelionpp_map, dropped_connection) TEST(dandelionpp_map, dropped_connection)
{ {
std::vector<boost::uuids::uuid> connections{6}; std::vector<boost::uuids::uuid> connections{6};
std::generate(connections.begin(), connections.end(), boost::uuids::random_generator{}); for (auto &c: connections)
c = boost::uuids::random_generator{}();
std::sort(connections.begin(), connections.end()); std::sort(connections.begin(), connections.end());
// select 3 of 6 outgoing connections // select 3 of 6 outgoing connections
@ -953,7 +955,8 @@ TEST(dandelionpp_map, dropped_connection)
} }
std::map<boost::uuids::uuid, boost::uuids::uuid> mapping; std::map<boost::uuids::uuid, boost::uuids::uuid> mapping;
std::vector<boost::uuids::uuid> in_connections{9}; std::vector<boost::uuids::uuid> in_connections{9};
std::generate(in_connections.begin(), in_connections.end(), boost::uuids::random_generator{}); for (auto &c: in_connections)
c = boost::uuids::random_generator{}();
{ {
std::map<boost::uuids::uuid, std::size_t> used; std::map<boost::uuids::uuid, std::size_t> used;
std::multimap<boost::uuids::uuid, boost::uuids::uuid> inverse_mapping; std::multimap<boost::uuids::uuid, boost::uuids::uuid> inverse_mapping;