feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Add more iterator constructor overloads

Browse Source
This commit is contained in:
Christian Mazakas
2023-04-20 15:35:04 -07:00
parent 5dfed4deec
commit 80d7203d78
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/unordered/concurrent_flat_map.hpp
View File

@ -217,6 +217,19 @@ namespace boost {
{
}
template <typename InputIterator>
concurrent_flat_map(
InputIterator f, InputIterator l, size_type n, const allocator_type& a)
: concurrent_flat_map(f, l, n, hasher(), key_equal(), a)
{
}
template <typename InputIterator>
concurrent_flat_map(InputIterator f, InputIterator l, size_type n,
const hasher& hf, const allocator_type& a)
: concurrent_flat_map(f, l, n, hf, key_equal(), a)
{
}
/// Capacity
///

59
test/cfoa/constructor_tests.cpp
View File

@ -524,6 +524,7 @@ namespace {
auto values = make_random_values(1024 * 16, [&] { return gen(rg); });
auto reference_map =
boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
raii::reset_counts();
std::mutex m;
@ -696,6 +697,53 @@ namespace {
}
}
template <class G>
void iterator_range_with_bucket_count_and_allocator(
G gen, test::random_generator rg)
{
auto values = make_random_values(1024 * 16, [&] { return gen(rg); });
auto reference_map =
boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
raii::reset_counts();
{
allocator_type a(3);
map_type x(values.begin(), values.end(), 0, a);
test_fuzzy_matches_reference(x, reference_map, rg);
BOOST_TEST_EQ(x.hash_function(), hasher());
BOOST_TEST_EQ(x.key_eq(), key_equal());
BOOST_TEST(x.get_allocator() == a);
}
check_raii_counts();
}
template <class G>
void iterator_range_with_bucket_count_hasher_and_allocator(
G gen, test::random_generator rg)
{
auto values = make_random_values(1024 * 16, [&] { return gen(rg); });
auto reference_map =
boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
raii::reset_counts();
{
allocator_type a(3);
hasher hf(1);
map_type x(values.begin(), values.end(), 0, hf, a);
test_fuzzy_matches_reference(x, reference_map, rg);
BOOST_TEST_EQ(x.hash_function(), hf);
BOOST_TEST_EQ(x.key_eq(), key_equal());
BOOST_TEST(x.get_allocator() == a);
}
check_raii_counts();
}
} // namespace
// clang-format off
@ -728,6 +776,17 @@ UNORDERED_TEST(
iterator_range_with_allocator,
((value_type_generator))
((default_generator)(sequential)(limited_range)))
UNORDERED_TEST(
iterator_range_with_bucket_count_and_allocator,
((value_type_generator))
((default_generator)(sequential)(limited_range)))
UNORDERED_TEST(
iterator_range_with_bucket_count_hasher_and_allocator,
((value_type_generator))
((default_generator)(sequential)(limited_range)))
// clang-format on
RUN_TESTS()