Delint.

Author: evoskuil

include/bitcoin/database/impl/primitives/hashmap.ipp

@@ -308,7 +308,6 @@ bool CLASS::put(const Link& link, const Key& key,
     const Element& element) NOEXCEPT
 {
     using namespace system;
-    const auto count = element.count();
     const auto ptr = manager_.get(link);
     if (!ptr)
         return false;
@@ -319,7 +318,11 @@ bool CLASS::put(const Link& link, const Key& key,
     sink.skip_bytes(Link::size);
     sink.write_bytes(key);
 
-    if constexpr (!is_slab) { BC_DEBUG_ONLY(sink.set_limit(Size * count);) }
+    if constexpr (!is_slab)
+    {
+        BC_DEBUG_ONLY(sink.set_limit(Size * element.count());)
+    }
+
     auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
     return element.to_data(sink) && head_.push(link, next, head_.index(key));
 }

include/bitcoin/database/impl/primitives/head2.ipp

@@ -57,7 +57,8 @@ Link CLASS::index(const Key& key) const NOEXCEPT
 {
     // Key is the logical bucket index (no-hash).
     if (key < buckets())
-        return manager::cast_link(key);
+        return manager<Link, system::data_array<zero>, Link::size>::
+            cast_link(key);
 
     return {};
 }

include/bitcoin/database/impl/primitives/iterator.ipp

@@ -19,8 +19,8 @@
 #ifndef LIBBITCOIN_DATABASE_PRIMITIVES_ELEMENT_IPP
 #define LIBBITCOIN_DATABASE_PRIMITIVES_ELEMENT_IPP
 
-#include <algorithm>
-#include <utility>
+#include <iterator>
+#include <cstring>
 #include <bitcoin/system.hpp>
 #include <bitcoin/database/define.hpp>
 
@@ -78,13 +78,13 @@ Link CLASS::to_match(Link link) const NOEXCEPT
         // element key matches (found)
         const auto key_ptr = std::next(offset, Link::size);
         if (is_zero(std::memcmp(key_.data(), key_ptr, array_count<Key>)))
-            return std::move(link);
+            return link;
 
         // set next element link (loop)
         link = system::unsafe_array_cast<uint8_t, Link::size>(offset);
     }
 
-    return std::move(link);
+    return link;
 }
 
 TEMPLATE
@@ -100,7 +100,7 @@ Link CLASS::to_next(Link link) const NOEXCEPT
         // set next element link (loop)
         link = { system::unsafe_array_cast<uint8_t, Link::size>(offset) };
         if (link.is_terminal())
-            return std::move(link);
+            return link;
 
         // get next element offset (fault)
         offset = memory_->offset(manager::link_to_position(link));
@@ -110,10 +110,10 @@ Link CLASS::to_next(Link link) const NOEXCEPT
         // next element key matches (found)
         const auto key_ptr = std::next(offset, Link::size);
         if (is_zero(std::memcmp(key_.data(), key_ptr, array_count<Key>)))
-            return std::move(link);
+            return link;
     }
 
-    return std::move(link);
+    return link;
 }
 
 } // namespace database

include/bitcoin/database/primitives/head2.hpp

@@ -66,8 +66,6 @@ class head2
     bool push(const bytes& current, const Link& index) NOEXCEPT;
 
 private:
-    using manager = manager<Link, system::data_array<zero>, Link::size>;
-
     template <size_t Bytes>
     static auto& array_cast(memory::iterator buffer) NOEXCEPT
     {

test/memory/map.cpp

@@ -481,6 +481,8 @@ BOOST_AUTO_TEST_CASE(map__set__no_minimum_expansion__expected_capacity)
 
 BOOST_AUTO_TEST_CASE(map__set__loaded__expected_fill)
 {
+    BC_PUSH_WARNING(NO_POINTER_ARITHMETIC)
+
     constexpr auto half_rate = 50_size;
     constexpr auto minimum = 1_size;
     constexpr auto size1 = 3_size;
@@ -575,6 +577,8 @@ BOOST_AUTO_TEST_CASE(map__set__loaded__expected_fill)
     BOOST_REQUIRE(!instance.unload());
     BOOST_REQUIRE(!instance.close());
     BOOST_REQUIRE(!instance.get_fault());
+
+    BC_POP_WARNING()
 }
 
 BOOST_AUTO_TEST_CASE(map__get__unloaded__false)

test/primitives/hashmap2.cpp

@@ -49,8 +49,6 @@ struct record4 { static constexpr size_t size = 4; };
 using slab_table = hashmap_<link5, key10, slab0::size>;
 using record_table = hashmap_<link5, key10, record4::size>;
 
-constexpr auto element_size = link5::size + array_count<key10> + record4::size;
-
 // record hashmap
 // ----------------------------------------------------------------------------