Merge branch 'dev' into duke

This commit is contained in:
Jonathan "Duke" Leto
2020-07-20 06:25:50 -07:00
40 changed files with 113 additions and 1602 deletions

View File

@@ -2438,11 +2438,10 @@ void CWallet::DeleteTransactions(std::vector<uint256> &removeTxs) {
return;
}
}
#if defined(__unix__) || defined(_WIN64)
// Miodrag: release memory back to the OS
#if defined(__GLIBC__)
malloc_trim(0);
#else
//TODO: This doesn't work on Mac
// On Mac and Win memory isn't kept back upon vector or list member erase, different garbage collector strategy. No need to force trimming.
#endif
}