diff --git a/test/unordered/contains_tests.cpp b/test/unordered/contains_tests.cpp index e6123959..01654479 100644 --- a/test/unordered/contains_tests.cpp +++ b/test/unordered/contains_tests.cpp @@ -265,7 +265,7 @@ void test_multiset() test_set_non_transparent_contains(); } -UNORDERED_AUTO_TEST (contains) { +UNORDERED_AUTO_TEST (contains_) { // avoid -Wshadow warning with `bool contains` test_map(); test_multimap(); test_set(); diff --git a/test/unordered/transparent_tests.cpp b/test/unordered/transparent_tests.cpp index 59fb48d7..02682213 100644 --- a/test/unordered/transparent_tests.cpp +++ b/test/unordered/transparent_tests.cpp @@ -1108,7 +1108,7 @@ template void test_map_transparent_erase() UnorderedMap map; - unsigned long num_erased = 0; + std::size_t num_erased = 0; num_erased = map.erase(0); BOOST_TEST(map.empty()); @@ -1150,7 +1150,7 @@ template void test_map_non_transparent_erase() UnorderedMap map; - unsigned long num_erased = 0; + std::size_t num_erased = 0; num_erased = map.erase(0); BOOST_TEST(map.empty()); @@ -1248,7 +1248,7 @@ template void test_set_transparent_erase() UnorderedSet set; - unsigned long num_erased = 0; + std::size_t num_erased = 0; num_erased = set.erase(0); BOOST_TEST(set.empty()); @@ -1290,7 +1290,7 @@ template void test_set_non_transparent_erase() UnorderedSet set; - unsigned long num_erased = 0; + std::size_t num_erased = 0; num_erased = set.erase(0); BOOST_TEST(set.empty()); diff --git a/test/unordered/unnecessary_copy_tests.cpp b/test/unordered/unnecessary_copy_tests.cpp index 1c5ff4b7..927203f9 100644 --- a/test/unordered/unnecessary_copy_tests.cpp +++ b/test/unordered/unnecessary_copy_tests.cpp @@ -552,8 +552,8 @@ namespace unnecessary_copy_tests { std::pair move_source_trial; reset(); - std::make_tuple(std::move(move_source_trial.first)); - std::make_tuple(std::move(move_source_trial.second)); + (void)std::make_tuple(std::move(move_source_trial.first)); + (void)std::make_tuple(std::move(move_source_trial.second)); int tuple_move_cost = ::unnecessary_copy_tests::count_copies::moves; int tuple_copy_cost = ::unnecessary_copy_tests::count_copies::copies;