Skip to content

Commit

Permalink
Merge pull request #431 from evoskuil/master
Browse files Browse the repository at this point in the history
Comments.
  • Loading branch information
evoskuil authored Aug 21, 2024
2 parents a617403 + 3804f56 commit d2029ec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 2 additions & 1 deletion include/bitcoin/network/memory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ class BCT_API memory
virtual arena* get_arena() NOEXCEPT = 0;
};

/// Default tracked memory implementation (untracked).
/// Default implementation of a thread safe arena container.
/// This returns the default_arena, which passes through to new/delete.
class BCT_API default_memory final
: public memory
{
Expand Down
3 changes: 0 additions & 3 deletions src/messages/block.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ namespace messages {

using namespace system;

////BC_PUSH_WARNING(NO_MALLOC_OR_FREE)
BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
BC_PUSH_WARNING(NO_UNGUARDED_POINTERS)

Expand Down Expand Up @@ -93,7 +92,6 @@ typename block::cptr block::deserialize(uint32_t version,
}

// static
// WARNING: all shared block components invalidate when the block destructs.
typename block::cptr block::deserialize(arena& arena, uint32_t version,
const data_chunk& data, bool witness) NOEXCEPT
{
Expand Down Expand Up @@ -165,7 +163,6 @@ size_t block::size(uint32_t, bool witness) const NOEXCEPT

BC_POP_WARNING()
BC_POP_WARNING()
////BC_POP_WARNING()

} // namespace messages
} // namespace network
Expand Down

0 comments on commit d2029ec

Please sign in to comment.