diff --git a/include/boost/unordered/concurrent_flat_map.hpp b/include/boost/unordered/concurrent_flat_map.hpp index a91a77e8..f957b0a5 100644 --- a/include/boost/unordered/concurrent_flat_map.hpp +++ b/include/boost/unordered/concurrent_flat_map.hpp @@ -419,16 +419,18 @@ namespace boost { } template - 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); } + return count_elements; } - void insert(std::initializer_list ilist) + size_type insert(std::initializer_list ilist) { - this->insert(ilist.begin(), ilist.end()); + return this->insert(ilist.begin(), ilist.end()); } template @@ -471,19 +473,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_visit(*first, f); } + return count_elements; } template - void insert_or_visit(std::initializer_list ilist, F f) + size_type insert_or_visit(std::initializer_list ilist, F 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 @@ -502,19 +506,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_cvisit(*first, f); } + return count_elements; } template - void insert_or_cvisit(std::initializer_list ilist, F f) + size_type insert_or_cvisit(std::initializer_list ilist, F 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 @@ -535,23 +541,25 @@ namespace boost { } template - void insert_and_visit( + size_type insert_and_visit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_visit( + size_type insert_and_visit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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 @@ -572,23 +580,25 @@ namespace boost { } template - void insert_and_cvisit( + size_type insert_and_cvisit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_cvisit( + size_type insert_and_cvisit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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 BOOST_FORCEINLINE bool emplace(Args&&... args) diff --git a/include/boost/unordered/concurrent_flat_set.hpp b/include/boost/unordered/concurrent_flat_set.hpp index 05f89e49..9aa2c8cc 100644 --- a/include/boost/unordered/concurrent_flat_set.hpp +++ b/include/boost/unordered/concurrent_flat_set.hpp @@ -425,16 +425,18 @@ namespace boost { } template - 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); } + return count_elements; } - void insert(std::initializer_list ilist) + size_type insert(std::initializer_list ilist) { - this->insert(ilist.begin(), ilist.end()); + return this->insert(ilist.begin(), ilist.end()); } template @@ -462,19 +464,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_visit(*first, f); } + return count_elements; } template - void insert_or_visit(std::initializer_list ilist, F f) + size_type insert_or_visit(std::initializer_list ilist, F 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 @@ -502,19 +506,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_cvisit(*first, f); } + return count_elements; } template - void insert_or_cvisit(std::initializer_list ilist, F f) + size_type insert_or_cvisit(std::initializer_list ilist, F 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 @@ -546,22 +552,24 @@ namespace boost { } template - void insert_and_visit( + size_type insert_and_visit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_visit(std::initializer_list ilist, F1 f1, F2 f2) + size_type insert_and_visit(std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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 @@ -593,23 +601,25 @@ namespace boost { } template - void insert_and_cvisit( + size_type insert_and_cvisit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_cvisit( + size_type insert_and_cvisit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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 BOOST_FORCEINLINE bool emplace(Args&&... args) diff --git a/include/boost/unordered/concurrent_node_map.hpp b/include/boost/unordered/concurrent_node_map.hpp index c9fb87cb..0b3eb2d9 100644 --- a/include/boost/unordered/concurrent_node_map.hpp +++ b/include/boost/unordered/concurrent_node_map.hpp @@ -426,16 +426,18 @@ namespace boost { } template - 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); } + return count_elements; } - void insert(std::initializer_list ilist) + size_type insert(std::initializer_list ilist) { - this->insert(ilist.begin(), ilist.end()); + return this->insert(ilist.begin(), ilist.end()); } insert_return_type insert(node_type&& nh) @@ -497,19 +499,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_visit(*first, f); } + return count_elements; } template - void insert_or_visit(std::initializer_list ilist, F f) + size_type insert_or_visit(std::initializer_list ilist, F 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 @@ -549,19 +553,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_cvisit(*first, f); } + return count_elements; } template - void insert_or_cvisit(std::initializer_list ilist, F f) + size_type insert_or_cvisit(std::initializer_list ilist, F 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 @@ -603,23 +609,25 @@ namespace boost { } template - void insert_and_visit( + size_type insert_and_visit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_visit( + size_type insert_and_visit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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 @@ -662,23 +670,25 @@ namespace boost { } template - void insert_and_cvisit( + size_type insert_and_cvisit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_cvisit( + size_type insert_and_cvisit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_INVOCABLE(F1) 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 diff --git a/include/boost/unordered/concurrent_node_set.hpp b/include/boost/unordered/concurrent_node_set.hpp index ef160606..cea51919 100644 --- a/include/boost/unordered/concurrent_node_set.hpp +++ b/include/boost/unordered/concurrent_node_set.hpp @@ -432,16 +432,18 @@ namespace boost { } template - 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); } + return count_elements; } - void insert(std::initializer_list ilist) + size_type insert(std::initializer_list ilist) { - this->insert(ilist.begin(), ilist.end()); + return this->insert(ilist.begin(), ilist.end()); } insert_return_type insert(node_type&& nh) @@ -488,19 +490,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_visit(*first, f); } + return count_elements; } template - void insert_or_visit(std::initializer_list ilist, F f) + size_type insert_or_visit(std::initializer_list ilist, F 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 @@ -549,19 +553,21 @@ namespace boost { } template - 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) - for (; first != last; ++first) { + size_type count_elements = 0; + for (; first != last; ++first, ++count_elements) { table_.emplace_or_cvisit(*first, f); } + return count_elements; } template - void insert_or_cvisit(std::initializer_list ilist, F f) + size_type insert_or_cvisit(std::initializer_list ilist, F 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 @@ -614,22 +620,25 @@ namespace boost { } template - void insert_and_visit( + size_type insert_and_visit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_visit(std::initializer_list ilist, F1 f1, F2 f2) + size_type insert_and_visit( + std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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 @@ -683,23 +692,25 @@ namespace boost { } template - void insert_and_cvisit( + size_type insert_and_cvisit( InputIterator first, InputIterator last, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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); } + return count_elements; } template - void insert_and_cvisit( + size_type insert_and_cvisit( std::initializer_list ilist, F1 f1, F2 f2) { BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F1) 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