Update hasmap

Author: Julian LALU

interface/core/containers/hashset.h

@@ -1002,44 +1002,6 @@ namespace hud
                 reset_control_and_slot();
             }
 
-            /**
-             * Insert a key in the hashset.
-             * @param key The key associated with the `value`
-             * @param args List of arguments pass to `value_type` constructor after the `key` itself
-             * @return Iterator to the `value`
-             */
-            template<typename... args_t>
-            requires(hud::is_constructible_v<slot_type, key_type, args_t...>)
-            constexpr iterator add(key_type &&key, args_t &&...args) noexcept
-            {
-                hud::pair<usize, bool> res {find_or_insert_no_construct(key)};
-                slot_type *slot_ptr {slot_ptr_ + res.first};
-                if (res.second)
-                {
-                    hud::memory::construct_object_at(slot_ptr, hud::move(key), hud::forward<args_t>(args)...);
-                }
-                return {control_ptr_ + res.first, slot_ptr};
-            }
-
-            /**
-             * Insert a key in the hashset.
-             * @param key The key associated with the `value`
-             * @param args List of arguments pass to `value_type` constructor after the `key` itself
-             * @return Iterator to the `value`
-             */
-            template<typename... args_t>
-            requires(hud::is_constructible_v<slot_type, const key_type &, args_t...>)
-            constexpr iterator add(const key_type &key, args_t &&...args) noexcept
-            {
-                hud::pair<usize, bool> res {find_or_insert_no_construct(key)};
-                slot_type *slot_ptr {slot_ptr_ + res.first};
-                if (res.second)
-                {
-                    hud::memory::construct_object_at(slot_ptr, key, hud::forward<args_t>(args)...);
-                }
-                return {control_ptr_ + res.first, slot_ptr};
-            }
-
             /** Find a key and return an iterator to the value. */
             template<typename K>
             [[nodiscard]]
@@ -1210,6 +1172,45 @@ namespace hud
                 return const_iterator {control_ptr_sentinel()};
             }
 
+        protected:
+            /**
+             * Insert a key in the hashset and pass
+             * @param key The key associated with the `value`
+             * @param args List of arguments pass to `value_type` constructor after the `key` itself
+             * @return Iterator to the `value`
+             */
+            template<typename... args_t>
+            requires(hud::is_constructible_v<slot_type, key_type, args_t...>)
+            constexpr iterator add(key_type &&key, args_t &&...args) noexcept
+            {
+                hud::pair<usize, bool> res {find_or_insert_no_construct(key)};
+                slot_type *slot_ptr {slot_ptr_ + res.first};
+                if (res.second)
+                {
+                    hud::memory::construct_object_at(slot_ptr, hud::move(key), hud::forward<args_t>(args)...);
+                }
+                return {control_ptr_ + res.first, slot_ptr};
+            }
+
+            /**
+             * Insert a key in the hashset.
+             * @param key The key associated with the `value`
+             * @param args List of arguments pass to `value_type` constructor after the `key` itself
+             * @return Iterator to the `value`
+             */
+            template<typename... args_t>
+            requires(hud::is_constructible_v<slot_type, const key_type &, args_t...>)
+            constexpr iterator add(const key_type &key, args_t &&...args) noexcept
+            {
+                hud::pair<usize, bool> res {find_or_insert_no_construct(key)};
+                slot_type *slot_ptr {slot_ptr_ + res.first};
+                if (res.second)
+                {
+                    hud::memory::construct_object_at(slot_ptr, key, hud::forward<args_t>(args)...);
+                }
+                return {control_ptr_ + res.first, slot_ptr};
+            }
+
         private:
             template<typename u_key_type>
             [[nodiscard]] constexpr u64 compute_hash(const u_key_type &key) noexcept
@@ -1902,11 +1903,6 @@ namespace hud
 
     } // namespace details::hashset
 
-    // using hashset_default_hasher = details::hashset::default_hasher;
-
-    // template<typename element_t>
-    // using hashset_default_key_equal = details::hashset::default_equal<element_t>;
-
     using hashset_default_allocator = details::hashset::default_allocator;
 
     template<

test/hashmap/hashmap_add.cpp

@@ -4977,4 +4977,27 @@ GTEST_TEST(hashmap, add_pair_by_move_construct_non_bitwise_move_constructible_di
             hud_assert_true(std::get<8>(second_element_result));
         }
     }
+}
+
+GTEST_TEST(hashmap, add_by_piecewise_construct_bitwise_same_type)
+{
+    using key_type = i32;
+    using value_type = i64;
+    using hashmap_type = hud::hashmap<key_type, value_type, hud::hash_64<key_type>, hud::equal<key_type>, hud_test::allocator_watcher<1>>;
+
+    const auto test = []()
+    {
+        constexpr usize reserved_size = 2;
+        hashmap_type map;
+        map.reserve(reserved_size);
+        // map.add(hud::tag_piecewise_construct, hud::forward_as_tuple(1), hud::forward_as_tuple(2));
+    };
+
+    // Non constant
+    {
+    }
+
+    // Constant
+    {
+    }
 }