From 0592b10e956f357b63902f832b50354cae8b808a Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 15 Jul 2024 22:14:36 -0400 Subject: [PATCH] Hack around g++ bogus name conflict (issue #1499). --- .../impl/stream/streamers/byte_reader.ipp | 8 +++--- .../system/stream/streamers/byte_reader.hpp | 4 +-- .../streamers/interfaces/bytereader.hpp | 4 +-- src/chain/block.cpp | 22 ++++++++-------- src/chain/input.cpp | 24 ++++++++--------- src/chain/operation.cpp | 4 +-- src/chain/output.cpp | 8 +++--- src/chain/script.cpp | 4 +-- src/chain/transaction.cpp | 26 +++++++++---------- src/chain/witness.cpp | 8 +++--- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp b/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp index c11160a036..ca33575301 100644 --- a/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp +++ b/include/bitcoin/system/impl/stream/streamers/byte_reader.ipp @@ -260,7 +260,7 @@ data_array_cptr byte_reader::read_forward_cptr() NOEXCEPT if (!valid()) return {}; - const auto cptr = to_allocated>(arena()); + const auto cptr = to_allocated>(get_arena()); if (!cptr) { invalidate(); @@ -400,7 +400,7 @@ chunk_cptr byte_reader::read_bytes_cptr(size_t size) NOEXCEPT return {}; // TODO: bypass vector byte fill. - const auto cptr = to_allocated(arena(), size); + const auto cptr = to_allocated(get_arena(), size); if (!cptr) { invalidate(); @@ -609,14 +609,14 @@ bool byte_reader::operator!() const NOEXCEPT template typename byte_reader::memory_arena -byte_reader::arena() const NOEXCEPT +byte_reader::get_arena() const NOEXCEPT { return allocator_.resource(); } template typename byte_reader::memory_allocator& -byte_reader::allocator() const NOEXCEPT +byte_reader::get_allocator() const NOEXCEPT { return allocator_; } diff --git a/include/bitcoin/system/stream/streamers/byte_reader.hpp b/include/bitcoin/system/stream/streamers/byte_reader.hpp index 00ccb9065e..637572f0c6 100644 --- a/include/bitcoin/system/stream/streamers/byte_reader.hpp +++ b/include/bitcoin/system/stream/streamers/byte_reader.hpp @@ -180,10 +180,10 @@ class byte_reader void invalidate() NOEXCEPT override; /// Memory resource used to populate vectors. - memory_arena arena() const NOEXCEPT override; + memory_arena get_arena() const NOEXCEPT override; /// Memory allocator used to construct objects. - memory_allocator& allocator() const NOEXCEPT override; + memory_allocator& get_allocator() const NOEXCEPT override; /// The stream is valid. operator bool() const NOEXCEPT override; diff --git a/include/bitcoin/system/stream/streamers/interfaces/bytereader.hpp b/include/bitcoin/system/stream/streamers/interfaces/bytereader.hpp index 041a577fd9..a1d9dc529c 100644 --- a/include/bitcoin/system/stream/streamers/interfaces/bytereader.hpp +++ b/include/bitcoin/system/stream/streamers/interfaces/bytereader.hpp @@ -149,10 +149,10 @@ class bytereader virtual void invalidate() NOEXCEPT = 0; /// Memory resource used to populate vectors. - virtual memory_arena arena() const NOEXCEPT = 0; + virtual memory_arena get_arena() const NOEXCEPT = 0; /// Memory allocator used to construct objects. - virtual memory_allocator& allocator() const NOEXCEPT = 0; + virtual memory_allocator& get_allocator() const NOEXCEPT = 0; /// The stream is valid. virtual operator bool() const NOEXCEPT = 0; diff --git a/src/chain/block.cpp b/src/chain/block.cpp index e0ff9942a7..3e220479df 100644 --- a/src/chain/block.cpp +++ b/src/chain/block.cpp @@ -108,11 +108,11 @@ block::block(reader&& source, bool witness) NOEXCEPT block::block(reader& source, bool witness) NOEXCEPT ////: block(from_data(source, witness)) : header_( - source.allocator().new_object(source), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(source), + source.get_allocator().deleter(source.get_arena())), txs_( - source.allocator().new_object(), - source.allocator().deleter(source.arena())) + source.get_allocator().new_object(), + source.get_allocator().deleter(source.get_arena())) { assign_data(source, witness); } @@ -150,7 +150,7 @@ bool block::operator!=(const block& other) const NOEXCEPT //// const auto read_transactions = [witness](reader& source) NOEXCEPT //// { //// // Allocate arena ctxs shared_ptr and std_vector(captures arena). -//// auto ctxs = to_allocated(source.arena()); +//// auto ctxs = to_allocated(source.get_arena()); //// //// BC_PUSH_WARNING(NO_UNGUARDED_POINTERS) //// auto txs = to_non_const_raw_ptr(ctxs); @@ -163,7 +163,7 @@ bool block::operator!=(const block& other) const NOEXCEPT //// // Allocate each shared_ptr and move ptr to reservation. //// // Each tx is constructed in place as allocated by/with its pointer. //// for (size_t tx = 0; tx < capacity; ++tx) -//// txs->push_back(to_allocated(source.arena(), +//// txs->push_back(to_allocated(source.get_arena(), //// source, witness)); //// //// return ctxs; @@ -173,7 +173,7 @@ bool block::operator!=(const block& other) const NOEXCEPT //// return //// { //// // Allocate header shared_ptr with header struct. -//// to_allocated(source.arena(), source), +//// to_allocated(source.get_arena(), source), //// read_transactions(source), //// source //// }; @@ -183,15 +183,15 @@ bool block::operator!=(const block& other) const NOEXCEPT BC_PUSH_WARNING(NO_UNGUARDED_POINTERS) void block::assign_data(reader& source, bool witness) NOEXCEPT { - auto& allocator = source.allocator(); + auto& allocator = source.get_allocator(); ////allocator.construct(&header_, //// allocator.new_object(source), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////allocator.construct(&txs_, //// allocator.new_object(), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); const auto count = source.read_size(max_block_size); auto txs = to_non_const_raw_ptr(txs_); @@ -200,7 +200,7 @@ void block::assign_data(reader& source, bool witness) NOEXCEPT for (size_t tx = 0; tx < count; ++tx) txs->emplace_back( allocator.new_object(source, witness), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); size_ = serialized_size(*txs_); valid_ = source; diff --git a/src/chain/input.cpp b/src/chain/input.cpp index 6c363ad30e..38d389c9fc 100644 --- a/src/chain/input.cpp +++ b/src/chain/input.cpp @@ -146,14 +146,14 @@ input::input(reader&& source) NOEXCEPT input::input(reader& source) NOEXCEPT ////: input(from_data(source)) : point_( - source.allocator().new_object(source), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(source), + source.get_allocator().deleter(source.get_arena())), script_( - source.allocator().new_object(source, true), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(source, true), + source.get_allocator().deleter(source.get_arena())), witness_( - source.allocator().new_object(/*empty*/), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(/*empty*/), + source.get_allocator().deleter(source.get_arena())), sequence_(source.read_4_bytes_little_endian()), valid_(source), size_(serialized_size(*script_, *witness_)) @@ -209,20 +209,20 @@ bool input::operator!=(const input& other) const NOEXCEPT // private void input::assign_data(reader&) NOEXCEPT { - ////auto& allocator = source.allocator(); + ////auto& allocator = source.get_allocator(); //// ////allocator.construct(&point_, //// allocator.new_object(source), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////allocator.construct(&script_, //// allocator.new_object(source, true), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////// Witness is deserialized and assigned by transaction. ////allocator.construct(&witness_, //// allocator.new_object(/*empty*/), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////sequence_ = source.read_4_bytes_little_endian(); ////size_ = serialized_size(*script_, *witness_); @@ -304,11 +304,11 @@ size_t input::witnessed_size() const NOEXCEPT void input::set_witness(reader& source) NOEXCEPT { - auto& allocator = source.allocator(); + auto& allocator = source.get_allocator(); witness_.reset( allocator.new_object(source, true), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); size_.witnessed = ceilinged_add(size_.nominal, witness_->serialized_size(true)); diff --git a/src/chain/operation.cpp b/src/chain/operation.cpp index de1065e392..220f038820 100644 --- a/src/chain/operation.cpp +++ b/src/chain/operation.cpp @@ -171,7 +171,7 @@ bool operation::operator!=(const operation& other) const NOEXCEPT // private void operation::assign_data(reader& source) NOEXCEPT { - auto& allocator = source.allocator(); + auto& allocator = source.get_allocator(); // Guard against resetting a previously-invalid stream. if (!source) @@ -201,7 +201,7 @@ void operation::assign_data(reader& source) NOEXCEPT // An invalid source.read_bytes_raw returns nullptr. allocator.construct(&data_, source.read_bytes_raw(size), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); underflow_ = !source; diff --git a/src/chain/output.cpp b/src/chain/output.cpp index 20d6491264..e1c4b72a77 100644 --- a/src/chain/output.cpp +++ b/src/chain/output.cpp @@ -94,8 +94,8 @@ output::output(reader& source) NOEXCEPT ////: output(from_data(source)) : value_(source.read_8_bytes_little_endian()), script_( - source.allocator().new_object(source, true), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(source, true), + source.get_allocator().deleter(source.get_arena())), valid_(source), size_(serialized_size(*script_, value_)) { @@ -143,13 +143,13 @@ bool output::operator!=(const output& other) const NOEXCEPT // private void output::assign_data(reader&) NOEXCEPT { - ////auto& allocator = source.allocator(); + ////auto& allocator = source.get_allocator(); //// ////value_ = source.read_8_bytes_little_endian(); //// ////allocator.construct(&script_, //// allocator.new_object(source, true), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////size_ = serialized_size(*script_, value_); ////valid_ = source; diff --git a/src/chain/script.cpp b/src/chain/script.cpp index b9f74b1d85..5a9ebe4e19 100644 --- a/src/chain/script.cpp +++ b/src/chain/script.cpp @@ -144,7 +144,7 @@ script::script(reader&& source, bool prefix) NOEXCEPT script::script(reader& source, bool prefix) NOEXCEPT ////: script(from_data(source, prefix)) - : ops_(source.arena()) + : ops_(source.get_arena()) { assign_data(source, prefix); } @@ -252,7 +252,7 @@ void script::assign_data(reader& source, bool prefix) NOEXCEPT source.set_limit(expected); } - ////auto& allocator = source.allocator(); + ////auto& allocator = source.get_allocator(); ////allocator.destroy(&ops_); ////allocator.construct(&ops_); ops_.reserve(op_count(source)); diff --git a/src/chain/transaction.cpp b/src/chain/transaction.cpp index 0e49ab38f4..43844a0560 100644 --- a/src/chain/transaction.cpp +++ b/src/chain/transaction.cpp @@ -169,11 +169,11 @@ transaction::transaction(reader& source, bool witness) NOEXCEPT ////: transaction(from_data(source, witness)) : version_(source.read_4_bytes_little_endian()), inputs_( - source.allocator().new_object(), - source.allocator().deleter(source.arena())), + source.get_allocator().new_object(), + source.get_allocator().deleter(source.get_arena())), outputs_( - source.allocator().new_object(), - source.allocator().deleter(source.arena())) + source.get_allocator().new_object(), + source.get_allocator().deleter(source.get_arena())) { assign_data(source, witness); } @@ -256,7 +256,7 @@ bool transaction::operator!=(const transaction& other) const NOEXCEPT ////{ //// // Allocate arena cputs shared_ptr and std_vector(captures arena). //// using puts_type = std_vector>; -//// auto cputs = to_allocated(source.arena()); +//// auto cputs = to_allocated(source.get_arena()); //// //// BC_PUSH_WARNING(NO_UNGUARDED_POINTERS) //// auto puts = to_non_const_raw_ptr(cputs); @@ -269,7 +269,7 @@ bool transaction::operator!=(const transaction& other) const NOEXCEPT //// // Allocate each shared_ptr and move ptr to reservation. //// // Each put is constructed in place as allocated by/with its pointer. //// for (size_t put = 0; put < capacity; ++put) -//// puts->push_back(to_allocated(source.arena(), source)); +//// puts->push_back(to_allocated(source.get_arena(), source)); //// //// return cputs; ////} @@ -325,15 +325,15 @@ bool transaction::operator!=(const transaction& other) const NOEXCEPT BC_PUSH_WARNING(NO_UNGUARDED_POINTERS) void transaction::assign_data(reader& source, bool witness) NOEXCEPT { - auto& allocator = source.allocator(); + auto& allocator = source.get_allocator(); ////allocator.construct(&inputs_, //// allocator.new_object(), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////allocator.construct(&outputs_, //// allocator.new_object(), - //// allocator.deleter(source.arena())); + //// allocator.deleter(source.get_arena())); //// ////version_ = source.read_4_bytes_little_endian(); @@ -343,7 +343,7 @@ void transaction::assign_data(reader& source, bool witness) NOEXCEPT for (size_t in = 0; in < count; ++in) ins->emplace_back( allocator.new_object(source), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); // Expensive repeated recomputation, so cache segregated state. // Detect witness as no inputs (marker) and expected flag (bip144). @@ -361,7 +361,7 @@ void transaction::assign_data(reader& source, bool witness) NOEXCEPT for (size_t in = 0; in < count; ++in) ins->emplace_back( allocator.new_object(source), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); auto outs = to_non_const_raw_ptr(outputs_); count = source.read_size(max_block_size); @@ -369,7 +369,7 @@ void transaction::assign_data(reader& source, bool witness) NOEXCEPT for (size_t out = 0; out < count; ++out) outs->emplace_back( allocator.new_object(source), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); // Read or skip witnesses as specified. if (witness) @@ -392,7 +392,7 @@ void transaction::assign_data(reader& source, bool witness) NOEXCEPT for (size_t out = 0; out < count; ++out) outs->emplace_back( allocator.new_object(source), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); } locktime_ = source.read_4_bytes_little_endian(); diff --git a/src/chain/witness.cpp b/src/chain/witness.cpp index 08e0cede56..8cf5f47a31 100644 --- a/src/chain/witness.cpp +++ b/src/chain/witness.cpp @@ -104,7 +104,7 @@ witness::witness(reader&& source, bool prefix) NOEXCEPT witness::witness(reader& source, bool prefix) NOEXCEPT ////: witness(from_data(source, prefix)) - : stack_(source.arena()) + : stack_(source.get_arena()) { assign_data(source, prefix); } @@ -168,7 +168,7 @@ void witness::skip(reader& source, bool prefix) NOEXCEPT void witness::assign_data(reader& source, bool prefix) NOEXCEPT { size_ = zero; - const auto& allocator = source.allocator(); + const auto& allocator = source.get_allocator(); ////allocator.destroy(&stack_); ////allocator.construct(&stack_); @@ -182,7 +182,7 @@ void witness::assign_data(reader& source, bool prefix) NOEXCEPT const auto size = source.read_size(max_block_weight); stack_.emplace_back( source.read_bytes_raw(size), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); size_ = element_size(size_, stack_.back()); } } @@ -193,7 +193,7 @@ void witness::assign_data(reader& source, bool prefix) NOEXCEPT const auto size = source.read_size(max_block_weight); stack_.emplace_back( source.read_bytes_raw(size), - allocator.deleter(source.arena())); + allocator.deleter(source.get_arena())); size_ = element_size(size_, stack_.back()); } }