boost_mirror/unordered
1
0
Fork 0
mirror of https://github.com/boostorg/unordered.git synced 2025-05-11 13:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the return value from cfoa 'insert()' overloads to match the docs for iterator-pair and initializer-list

Browse Source
This commit is contained in:
Braden Ganetsky 2024-09-25 21:39:59 -05:00
parent 1e043993ac
commit 3fe7871745
4 changed files with 121 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,16 +419,18 @@ namespace boost {
} }
template <class InputIterator> template <class InputIterator>
void insert(InputIterator begin, InputIterator end) size_type insert(InputIterator begin, InputIterator end)
{ {
for (auto pos = begin; pos != end; ++pos) { size_type count_elements = 0;
for (auto pos = begin; pos != end; ++pos, ++count_elements) {
table_.emplace(*pos); table_.emplace(*pos);
} }
return count_elements;
} }
void insert(std::initializer_list<value_type> ilist) size_type insert(std::initializer_list<value_type> ilist)
{ {
this->insert(ilist.begin(), ilist.end()); return this->insert(ilist.begin(), ilist.end());
} }
template <class M> template <class M>
@ -471,19 +473,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_visit(InputIterator first, InputIterator last, F f) size_type insert_or_visit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_visit(*first, f); table_.emplace_or_visit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_visit(std::initializer_list<value_type> ilist, F f) size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
this->insert_or_visit(ilist.begin(), ilist.end(), f); return this->insert_or_visit(ilist.begin(), ilist.end(), f);
} }
template <class Ty, class F> template <class Ty, class F>
@ -502,19 +506,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_cvisit(InputIterator first, InputIterator last, F f) size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_cvisit(*first, f); table_.emplace_or_cvisit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_cvisit(std::initializer_list<value_type> ilist, F f) size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_cvisit(ilist.begin(), ilist.end(), f); return this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
} }
template <class Ty, class F1, class F2> template <class Ty, class F1, class F2>
@ -535,23 +541,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_visit(*first, f1, f2); table_.emplace_and_visit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class Ty, class F1, class F2> template <class Ty, class F1, class F2>
@ -572,23 +580,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_cvisit(*first, f1, f2); table_.emplace_and_cvisit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args) template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)

50
include/boost/unordered/concurrent_flat_set.hpp
View File

@ -425,16 +425,18 @@ namespace boost {
} }
template <class InputIterator> template <class InputIterator>
void insert(InputIterator begin, InputIterator end) size_type insert(InputIterator begin, InputIterator end)
{ {
for (auto pos = begin; pos != end; ++pos) { size_type count_elements = 0;
for (auto pos = begin; pos != end; ++pos, ++count_elements) {
table_.emplace(*pos); table_.emplace(*pos);
} }
return count_elements;
} }
void insert(std::initializer_list<value_type> ilist) size_type insert(std::initializer_list<value_type> ilist)
{ {
this->insert(ilist.begin(), ilist.end()); return this->insert(ilist.begin(), ilist.end());
} }
template <class F> template <class F>
@ -462,19 +464,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_visit(InputIterator first, InputIterator last, F f) size_type insert_or_visit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_visit(*first, f); table_.emplace_or_visit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_visit(std::initializer_list<value_type> ilist, F f) size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_visit(ilist.begin(), ilist.end(), f); return this->insert_or_visit(ilist.begin(), ilist.end(), f);
} }
template <class F> template <class F>
@ -502,19 +506,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_cvisit(InputIterator first, InputIterator last, F f) size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_cvisit(*first, f); table_.emplace_or_cvisit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_cvisit(std::initializer_list<value_type> ilist, F f) size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_cvisit(ilist.begin(), ilist.end(), f); return this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
} }
template <class F1, class F2> template <class F1, class F2>
@ -546,22 +552,24 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_visit(*first, f1, f2); table_.emplace_and_visit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_visit(std::initializer_list<value_type> ilist, F1 f1, F2 f2) size_type insert_and_visit(std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class F1, class F2> template <class F1, class F2>
@ -593,23 +601,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_cvisit(*first, f1, f2); table_.emplace_and_cvisit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args) template <class... Args> BOOST_FORCEINLINE bool emplace(Args&&... args)

50
include/boost/unordered/concurrent_node_map.hpp
View File

@ -426,16 +426,18 @@ namespace boost {
} }
template <class InputIterator> template <class InputIterator>
void insert(InputIterator begin, InputIterator end) size_type insert(InputIterator begin, InputIterator end)
{ {
for (auto pos = begin; pos != end; ++pos) { size_type count_elements = 0;
for (auto pos = begin; pos != end; ++pos, ++count_elements) {
table_.emplace(*pos); table_.emplace(*pos);
} }
return count_elements;
} }
void insert(std::initializer_list<value_type> ilist) size_type insert(std::initializer_list<value_type> ilist)
{ {
this->insert(ilist.begin(), ilist.end()); return this->insert(ilist.begin(), ilist.end());
} }
insert_return_type insert(node_type&& nh) insert_return_type insert(node_type&& nh)
@ -497,19 +499,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_visit(InputIterator first, InputIterator last, F f) size_type insert_or_visit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_visit(*first, f); table_.emplace_or_visit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_visit(std::initializer_list<value_type> ilist, F f) size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F)
this->insert_or_visit(ilist.begin(), ilist.end(), f); return this->insert_or_visit(ilist.begin(), ilist.end(), f);
} }
template <class F> template <class F>
@ -549,19 +553,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_cvisit(InputIterator first, InputIterator last, F f) size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_cvisit(*first, f); table_.emplace_or_cvisit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_cvisit(std::initializer_list<value_type> ilist, F f) size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_cvisit(ilist.begin(), ilist.end(), f); return this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
} }
template <class F> template <class F>
@ -603,23 +609,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_visit(*first, f1, f2); table_.emplace_and_visit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F2)
this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class F1, class F2> template <class F1, class F2>
@ -662,23 +670,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_cvisit(*first, f1, f2); table_.emplace_and_cvisit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class F1, class F2> template <class F1, class F2>

51
include/boost/unordered/concurrent_node_set.hpp
View File

@ -432,16 +432,18 @@ namespace boost {
} }
template <class InputIterator> template <class InputIterator>
void insert(InputIterator begin, InputIterator end) size_type insert(InputIterator begin, InputIterator end)
{ {
for (auto pos = begin; pos != end; ++pos) { size_type count_elements = 0;
for (auto pos = begin; pos != end; ++pos, ++count_elements) {
table_.emplace(*pos); table_.emplace(*pos);
} }
return count_elements;
} }
void insert(std::initializer_list<value_type> ilist) size_type insert(std::initializer_list<value_type> ilist)
{ {
this->insert(ilist.begin(), ilist.end()); return this->insert(ilist.begin(), ilist.end());
} }
insert_return_type insert(node_type&& nh) insert_return_type insert(node_type&& nh)
@ -488,19 +490,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_visit(InputIterator first, InputIterator last, F f) size_type insert_or_visit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_visit(*first, f); table_.emplace_or_visit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_visit(std::initializer_list<value_type> ilist, F f) size_type insert_or_visit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_visit(ilist.begin(), ilist.end(), f); return this->insert_or_visit(ilist.begin(), ilist.end(), f);
} }
template <class F> template <class F>
@ -549,19 +553,21 @@ namespace boost {
} }
template <class InputIterator, class F> template <class InputIterator, class F>
void insert_or_cvisit(InputIterator first, InputIterator last, F f) size_type insert_or_cvisit(InputIterator first, InputIterator last, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_or_cvisit(*first, f); table_.emplace_or_cvisit(*first, f);
} }
return count_elements;
} }
template <class F> template <class F>
void insert_or_cvisit(std::initializer_list<value_type> ilist, F f) size_type insert_or_cvisit(std::initializer_list<value_type> ilist, F f)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
this->insert_or_cvisit(ilist.begin(), ilist.end(), f); return this->insert_or_cvisit(ilist.begin(), ilist.end(), f);
} }
template <class F> template <class F>
@ -614,22 +620,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_visit( size_type insert_and_visit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_visit(*first, f1, f2); table_.emplace_and_visit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_visit(std::initializer_list<value_type> ilist, F1 f1, F2 f2) size_type insert_and_visit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_visit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class F1, class F2> template <class F1, class F2>
@ -683,23 +692,25 @@ namespace boost {
} }
template <class InputIterator, class F1, class F2> template <class InputIterator, class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
InputIterator first, InputIterator last, F1 f1, F2 f2) InputIterator first, InputIterator last, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
for (; first != last; ++first) { size_type count_elements = 0;
for (; first != last; ++first, ++count_elements) {
table_.emplace_and_cvisit(*first, f1, f2); table_.emplace_and_cvisit(*first, f1, f2);
} }
return count_elements;
} }
template <class F1, class F2> template <class F1, class F2>
void insert_and_cvisit( size_type insert_and_cvisit(
std::initializer_list<value_type> ilist, F1 f1, F2 f2) std::initializer_list<value_type> ilist, F1 f1, F2 f2)
{ {
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1)
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2) BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F2)
this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2); return this->insert_and_cvisit(ilist.begin(), ilist.end(), f1, f2);
} }
template <class F1, class F2> template <class F1, class F2>