Merge pull request #1504 from evoskuil/master

Make byte_reader::default_arena() protected.
libbitcoin · Jul 22, 2024 · 41f9be3 · 41f9be3
2 parents 8682538 + 508658c
commit 41f9be3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp b/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp
@@ -39,7 +39,7 @@ namespace system {
 // The intended behavior in this case is program abort.
 BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
 
-// private/static
+// protected/static
 template <typename IStream>
 inline typename byte_reader<IStream>::memory_arena
 byte_reader<IStream>::default_arena() NOEXCEPT

diff --git a/include/bitcoin/system/stream/streamers/byte_reader.hpp b/include/bitcoin/system/stream/streamers/byte_reader.hpp
@@ -192,6 +192,7 @@ class byte_reader
     bool operator!() const NOEXCEPT override;
 
 protected:
+    static inline memory_arena default_arena() NOEXCEPT;
     static constexpr uint8_t pad() { return 0x00; };
 
     // The maximum addressable stream position.
@@ -207,8 +208,6 @@ class byte_reader
     virtual bool get_exhausted() const NOEXCEPT;
 
 private:
-    static inline memory_arena default_arena() NOEXCEPT;
-
     bool valid() const NOEXCEPT;
     void invalid() NOEXCEPT;
     void validate() NOEXCEPT;

diff --git a/test/chain/block.cpp b/test/chain/block.cpp
@@ -218,7 +218,6 @@ const block& get_block() NOEXCEPT
     constexpr uint32_t locktime{ 7 };
     constexpr uint32_t sequence{ 8 };
     constexpr uint64_t value{ 9 };
-    constexpr hash_digest point_hash{ 9 };
     constexpr bool minimal{ true };
 
     static const block instance