fixed cfoa range insert functions to return the number of elements inserted instead of the size of the input range (#344)

* fixed cfoa range insert functions to return the number of elements inserted instead of the size of the input range

* avoided variable shadowing

* fixed calculation error in test

* updated release notes

doc/Jamfile.v2

@@ -2,6 +2,8 @@
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+import path ;
+
 make html_ : build_antora.sh : @run-script ;
 
 actions run-script
@@ -9,15 +11,18 @@ actions run-script
     bash $(>)
 }
 
+path-constant DOC_DIR : . ;
+.node_modules = [ path.join $(DOC_DIR) node_modules ] ;
+
 make cleanup_node_modules_ : html_ : @cleanup-node-modules ;
 
 actions cleanup-node-modules
 {
-    bash -c "rm -rf node_modules"
+    rm -rf $(.node_modules)
 }
 
 ###############################################################################
 alias boostdoc ;
 explicit boostdoc ;
-alias boostrelease : html_ ;
+alias boostrelease : html_ cleanup_node_modules_ ;
 explicit boostrelease ;

doc/antora_docs.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd "$SCRIPT_DIR"
-
-npm ci
-npx antora unordered-playbook.yml

doc/modules/ROOT/pages/changes.adoc

@@ -6,6 +6,11 @@
 :github-pr-url: https://github.com/boostorg/unordered/pull
 :cpp: C++
 
+== Release 1.91.0
+
+* Fixed the returned value of range insertion in concurrent containers
+({github-pr-url}/344[PR#344^]).
+
 == Release 1.89.0
 
 * Deprecated `boost::unordered::hash_is_avalanching` is now a using-declaration of

doc/modules/ROOT/pages/copyright.adoc

@@ -11,7 +11,7 @@ Copyright (C) 2005-2008 Daniel James
 
 Copyright (C) 2022-2025 Christian Mazakas
 
-Copyright (C) 2022-2025 Joaquín M López Muñoz
+Copyright (C) 2022-2026 Joaquín M López Muñoz
 
 Copyright (C) 2022-2023 Peter Dimov
 

extra/boost_unordered_printers.py

@@ -1,4 +1,4 @@
-# Copyright 2024-2025 Braden Ganetsky
+# Copyright 2024-2026 Braden Ganetsky
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
@@ -16,8 +16,14 @@ class BoostUnorderedHelpers:
             return n
 
     def maybe_unwrap_foa_element(e):
-        if f"{e.type.strip_typedefs()}".startswith("boost::unordered::detail::foa::element_type<"):
-            return e["p"]
+        # Sometimes the complex typedefs can't be resolved through a pointer
+        if e.type.strip_typedefs().code == gdb.TYPE_CODE_PTR:
+            foa_element = e.dereference()
+        else:
+            foa_element = e
+
+        if f"{foa_element.type.strip_typedefs()}".startswith("boost::unordered::detail::foa::element_type<"):
+            return foa_element["p"]
         else:
             return e
 

include/boost/unordered/concurrent_flat_map.hpp

@@ -1,7 +1,7 @@
 /* Fast open-addressing concurrent hashmap.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2023-2026 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -423,8 +423,8 @@ namespace boost {
       size_type insert(InputIterator begin, InputIterator end)
       {
         size_type count_elements = 0;
-        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
-          table_.emplace(*pos);
+        for (auto pos = begin; pos != end; ++pos) {
+          if (table_.emplace(*pos)) ++count_elements;
         }
         return count_elements;
       }

include/boost/unordered/concurrent_flat_set.hpp

@@ -1,7 +1,7 @@
 /* Fast open-addressing concurrent hashset.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2023-2026 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -429,8 +429,8 @@ namespace boost {
       size_type insert(InputIterator begin, InputIterator end)
       {
         size_type count_elements = 0;
-        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
-          table_.emplace(*pos);
+        for (auto pos = begin; pos != end; ++pos) {
+          if (table_.emplace(*pos)) ++count_elements;
         }
         return count_elements;
       }

include/boost/unordered/concurrent_node_map.hpp

@@ -1,7 +1,7 @@
 /* Fast open-addressing, node-based concurrent hashmap.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2023-2026 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -430,8 +430,8 @@ namespace boost {
       size_type insert(InputIterator begin, InputIterator end)
       {
         size_type count_elements = 0;
-        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
-          table_.emplace(*pos);
+        for (auto pos = begin; pos != end; ++pos) {
+          if (table_.emplace(*pos)) ++count_elements;
         }
         return count_elements;
       }

include/boost/unordered/concurrent_node_set.hpp

@@ -1,7 +1,7 @@
 /* Fast open-addressing, node-based concurrent hashset.
  *
  * Copyright 2023 Christian Mazakas.
- * Copyright 2023-2024 Joaquin M Lopez Munoz.
+ * Copyright 2023-2026 Joaquin M Lopez Munoz.
  * Distributed under the Boost Software License, Version 1.0.
  * (See accompanying file LICENSE_1_0.txt or copy at
  * http://www.boost.org/LICENSE_1_0.txt)
@@ -436,8 +436,8 @@ namespace boost {
       size_type insert(InputIterator begin, InputIterator end)
       {
         size_type count_elements = 0;
-        for (auto pos = begin; pos != end; ++pos, ++count_elements) {
-          table_.emplace(*pos);
+        for (auto pos = begin; pos != end; ++pos) {
+          if (table_.emplace(*pos)) ++count_elements;
         }
         return count_elements;
       }

include/boost/unordered/detail/unordered_printers.hpp

@@ -1,8 +1,8 @@
-// Copyright 2024-2025 Braden Ganetsky
+// Copyright 2024-2026 Braden Ganetsky
 // Distributed under the Boost Software License, Version 1.0.
 // https://www.boost.org/LICENSE_1_0.txt
 
-// Generated on 2025-08-21T03:09:19
+// Generated on 2026-01-24T00:34:53
 
 #ifndef BOOST_UNORDERED_DETAIL_UNORDERED_PRINTERS_HPP
 #define BOOST_UNORDERED_DETAIL_UNORDERED_PRINTERS_HPP
@@ -29,8 +29,14 @@ __asm__(".pushsection \".debug_gdb_scripts\", \"MS\",%progbits,1\n"
         ".ascii \"            return n\\n\"\n"
 
         ".ascii \"    def maybe_unwrap_foa_element(e):\\n\"\n"
-        ".ascii \"        if f\\\"{e.type.strip_typedefs()}\\\".startswith(\\\"boost::unordered::detail::foa::element_type<\\\"):\\n\"\n"
-        ".ascii \"            return e[\\\"p\\\"]\\n\"\n"
+        ".ascii \"        # Sometimes the complex typedefs can't be resolved through a pointer\\n\"\n"
+        ".ascii \"        if e.type.strip_typedefs().code == gdb.TYPE_CODE_PTR:\\n\"\n"
+        ".ascii \"            foa_element = e.dereference()\\n\"\n"
+        ".ascii \"        else:\\n\"\n"
+        ".ascii \"            foa_element = e\\n\"\n"
+
+        ".ascii \"        if f\\\"{foa_element.type.strip_typedefs()}\\\".startswith(\\\"boost::unordered::detail::foa::element_type<\\\"):\\n\"\n"
+        ".ascii \"            return foa_element[\\\"p\\\"]\\n\"\n"
         ".ascii \"        else:\\n\"\n"
         ".ascii \"            return e\\n\"\n"
 

test/cfoa/insert_tests.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2023 Christian Mazakas
-// Copyright (C) 2023-2024 Joaquin M Lopez Munoz
+// Copyright (C) 2023-2026 Joaquin M Lopez Munoz
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
@@ -148,12 +148,18 @@ namespace {
         values2.push_back(raii_convertible(v));
       }
 
-      thread_runner(values2, [&x](boost::span<raii_convertible> s) {
-        BOOST_TEST_EQ(x.insert(s.begin(), s.end()), s.size());
+      auto sz = x.size();
+      std::atomic<std::uint64_t> num_inserts{0};
+      std::atomic<std::uint64_t> num_attempted_inserts{0};
+      thread_runner(values2, [&x, &num_inserts, &num_attempted_inserts](boost::span<raii_convertible> s) {
+        num_inserts += x.insert(s.begin(), s.begin() + s.size() / 2);
+        num_inserts += x.insert(s.begin(), s.end());
+        num_attempted_inserts += s.size() + s.size() / 2;
       });
+      BOOST_TEST_EQ(x.size(), sz + num_inserts);
 
       BOOST_TEST_EQ(
-        raii::default_constructor, value_type_cardinality * values2.size());
+        raii::default_constructor, value_type_cardinality * num_attempted_inserts);
 #if BOOST_WORKAROUND(BOOST_GCC_VERSION, >= 50300) && \
     BOOST_WORKAROUND(BOOST_GCC_VERSION, <  50500)
       // some versions of old gcc have trouble eliding copies here
@@ -1010,9 +1016,11 @@ namespace {
       {
         X x;
 
-        thread_runner(dummy, [&x, &init_list](boost::span<raii>) {
-          BOOST_TEST_EQ(x.insert(init_list), init_list.size());
+        std::atomic<std::uint64_t> num_inserts{0};
+        thread_runner(dummy, [&x, &init_list, &num_inserts](boost::span<raii>) {
+          num_inserts += x.insert(init_list);
         });
+        BOOST_TEST_EQ(num_inserts, x.size());
 
         BOOST_TEST_EQ(x.size(), reference_cont.size());
 

test/cmake_subdir_test/CMakeLists.txt

@@ -18,14 +18,9 @@ assert
 config
 container_hash
 core
-move
 mp11
 predef
-preprocessor
-static_assert
 throw_exception
-tuple
-type_traits
 
 # Secondary dependencies