Skip to content

Commit

Permalink
Merge pull request #1542 from evoskuil/master
Browse files Browse the repository at this point in the history
Fix test, delint gcc 13.
  • Loading branch information
evoskuil authored Oct 28, 2024
2 parents a5d177b + a879d21 commit 4968ba9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion include/bitcoin/system/data/external_ptr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class external_ptr
private:
const Type* pointer_{};

inline const Type* get_unassigned() const NOEXCEPT
static inline const Type* get_unassigned() NOEXCEPT
{
static Type unassigned{};
return &unassigned;
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/system/impl/machine/interpreter.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ op_check_multisig_verify() NOEXCEPT
{
const auto bip147 = state::is_enabled(flags::bip147_rule);

size_t count;
size_t count{};
if (!state::pop_index32(count))
return error::op_check_multisig_verify1;

Expand Down
2 changes: 1 addition & 1 deletion test/test.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@ class reporting_arena

void do_deallocate(void* ptr, size_t bytes, size_t) NOEXCEPT override
{
report(ptr, bytes, false);
BC_PUSH_WARNING(NO_NEW_OR_DELETE)
::operator delete(ptr);
BC_POP_WARNING()
report(ptr, bytes, false);
++dec_count;
dec_bytes += bytes;
}
Expand Down

0 comments on commit 4968ba9

Please sign in to comment.