mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-15 12:51:00 +02:00
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108)
This commit is contained in:
commit
31df518140
40 changed files with 59 additions and 88 deletions
|
|
@ -95,7 +95,7 @@ struct MemoryCheck {
|
|||
{
|
||||
return true;
|
||||
}
|
||||
MemoryCheck(){};
|
||||
MemoryCheck() = default;
|
||||
MemoryCheck(const MemoryCheck& x)
|
||||
{
|
||||
// We have to do this to make sure that destructor calls are paired
|
||||
|
|
@ -129,7 +129,7 @@ struct FrozenCleanupCheck {
|
|||
{
|
||||
return true;
|
||||
}
|
||||
FrozenCleanupCheck() {}
|
||||
FrozenCleanupCheck() = default;
|
||||
~FrozenCleanupCheck()
|
||||
{
|
||||
if (should_freeze) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue