Style.

Author: evoskuil

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

@@ -134,8 +134,8 @@ Link CLASS::at(size_t key) const NOEXCEPT
         // Reads full padded word.
         const auto raw = ptr->data();
         // xcode clang++16 does not support C++20 std::atomic_ref.
-        ////const std::atomic_ref<integer> head(unsafe_byte_cast<integer>(raw));
-        const auto& head = *pointer_cast<std::atomic<integer>>(raw);
+        ////const std::atomic_ref<link> head(unsafe_byte_cast<link>(raw));
+        const auto& head = *pointer_cast<std::atomic<CLASS::link>>(raw);
         return head.load(std::memory_order_relaxed);
     }
     else
@@ -164,8 +164,8 @@ bool CLASS::push(const Link& link, const Link& index) NOEXCEPT
         // Writes full padded word (0x00 fill).
         const auto raw = ptr->data();
         // xcode clang++16 does not support C++20 std::atomic_ref.
-        ////const std::atomic_ref<integer> head(unsafe_byte_cast<integer>(raw));
-        auto& head = *pointer_cast<std::atomic<integer>>(raw);
+        ////const std::atomic_ref<link> head(unsafe_byte_cast<link>(raw));
+        auto& head = *pointer_cast<std::atomic<CLASS::link>>(raw);
         head.store(link, std::memory_order_relaxed);
     }
     else

include/bitcoin/database/primitives/arrayhead.hpp

@@ -71,11 +71,11 @@ class arrayhead
     bool push(const Link& link, const Link& index) NOEXCEPT;
 
 private:
-    using integer = Link::integer;
+    using link = Link::integer;
     using body = manager<Link, system::data_array<zero>, Link::size>;
-    static_assert(std::atomic<integer>::is_always_lock_free);
+    static_assert(std::atomic<link>::is_always_lock_free);
     static_assert(is_nonzero(Link::size));
-    static constexpr auto bucket_size = Align ? sizeof(integer) : Link::size;
+    static constexpr auto bucket_size = Align ? sizeof(link) : Link::size;
 
     template <size_t Bytes>
     static inline auto& to_array(memory::iterator it) NOEXCEPT
@@ -87,8 +87,7 @@ class arrayhead
     {
         using namespace system;
         const auto offset = floored_divide(position, bucket_size);
-        const auto link = floored_subtract(offset, one);
-        return possible_narrow_cast<integer>(link);
+        return possible_narrow_cast<link>(floored_subtract(offset, one));
     }
 
     // Byte offset of bucket index within head file.