Skip to content

Commit 60e6a60

Browse files
committed
Use C++11 thread-safe static initializers in coins.h/coins.cpp
Taken from Bitcoin bitcoin#8173/888483098e60f2a944f1d246bbfec4d14a2975f8 Needed to align code for upcoming per-utxo backports.
1 parent 44526af commit 60e6a60

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/coins.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ void CCoinsViewBacked::SetBackend(CCoinsView &viewIn) { base = &viewIn; }
5656
bool CCoinsViewBacked::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock) { return base->BatchWrite(mapCoins, hashBlock); }
5757
CCoinsViewCursor *CCoinsViewBacked::Cursor() const { return base->Cursor(); }
5858

59-
SaltedTxidHasher::SaltedTxidHasher()
60-
{
61-
GetRandBytes((unsigned char*)&k0, sizeof(k0));
62-
GetRandBytes((unsigned char*)&k1, sizeof(k1));
63-
}
59+
SaltedTxidHasher::SaltedTxidHasher() : k0(GetRand(std::numeric_limits<uint64_t>::max())), k1(GetRand(std::numeric_limits<uint64_t>::max())) {}
6460

6561
CCoinsViewCache::CCoinsViewCache(CCoinsView *baseIn) : CCoinsViewBacked(baseIn), hasModifier(false), cachedCoinsUsage(0) { }
6662

src/coins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ class SaltedTxidHasher
269269
{
270270
private:
271271
/** Salt */
272-
uint64_t k0, k1;
272+
const uint64_t k0, k1;
273273

274274
public:
275275
SaltedTxidHasher();

0 commit comments

Comments
 (0)