diff options
| author | fanquake <fanquake@gmail.com> | 2023-11-22 17:34:29 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-11-22 18:25:34 +0000 |
| commit | e4fef4ae65c68ebd34774700dc4801c24313d469 (patch) | |
| tree | 14dc5ac62acc9eb9823b24e1d92551a9f0f268a9 /src/coins.h | |
| parent | 67b25125603aacaa445bf6e9f0147789a039a679 (diff) | |
| parent | 2f86d3053314c382dfce5cf314e98811ed433859 (diff) | |
Merge bitcoin/bitcoin#28872: [26.x] Changes for rc3v26.0rc3
2f86d3053314c382dfce5cf314e98811ed433859 doc: update release notes for v26.0rc3 (fanquake)
3b6c7f240c85fa7a0eb0f037cdc9dd0975a02e42 doc: update manual pages for v26.0rc3 (fanquake)
3db4d1cff292c003f58a1755ba94cb0c5ebbb700 build: bump version to v26.0rc3 (fanquake)
6045f38dc8f6a3e028e45fd0024d0b4c6b3cf918 build: Fix regression in "ARMv8 CRC32 intrinsics" test (Hennadii Stepanov)
5eaa179f2785d74b621ff7edbe7fd8be9cdeb419 ci: Avoid toolset ambiguity that MSVC can't handle (Hennadii Stepanov)
55af112565aefc9167877076d6ee4dae991dcd6d p2p: do not make automatic outbound connections to addnode peers (Jon Atack)
5e0bcc1977ea1efe3888c8fcd0991f3116ab1125 ci: Switch from `apt` to `apt-get` (Hennadii Stepanov)
437a5316e50b7906780105bea6094ea7c6a34ddd ci: Update apt cache (Hennadii Stepanov)
1488648104718fe727e4a0784120cc95bf232bdb pool: change memusage_test to use int64_t, add allocation check (Martin Leitner-Ankerl)
bcc183cccefdc84a09e43965d6b88a8bec3a5446 pool: make sure PoolAllocator uses the correct alignment (Martin Leitner-Ankerl)
7dda4991a875ca9bd9f79b3d52b12837ad7f92f1 doc: regenerate example bitcoin.conf (fanquake)
5845331a6c57c25c873818ad165516a5df29b099 doc: rewrite explanation for -par= (fanquake)
Pull request description:
Currently backports:
* https://github.com/bitcoin/bitcoin/pull/28858
* https://github.com/bitcoin/bitcoin/pull/28895 (partial)
* https://github.com/bitcoin/bitcoin/pull/28913
* https://github.com/bitcoin/bitcoin/pull/28905
* https://github.com/bitcoin/bitcoin/pull/28919
* https://github.com/bitcoin/bitcoin/pull/28925
Also includes changes for rc3, and reintegrating the release-notes.
ACKs for top commit:
hebasto:
re-ACK 2f86d3053314c382dfce5cf314e98811ed433859, only https://github.com/bitcoin/bitcoin/pull/28919 backported since my [recent](https://github.com/bitcoin/bitcoin/pull/28872#pullrequestreview-1744950215) review.
TheCharlatan:
ACK 2f86d3053314c382dfce5cf314e98811ed433859
Tree-SHA512: 43c91b344d37f582081ac184ac59cf76c741317b2b69a24fcd4287eefa8333e20c545e150798f4057d6f4ac8e70ed9cba1c8dd9777b11c1cf8992cce09108727
Diffstat (limited to 'src/coins.h')
| -rw-r--r-- | src/coins.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/coins.h b/src/coins.h index a6cbb03133..bbf9e3895f 100644 --- a/src/coins.h +++ b/src/coins.h @@ -145,8 +145,7 @@ using CCoinsMap = std::unordered_map<COutPoint, SaltedOutpointHasher, std::equal_to<COutPoint>, PoolAllocator<std::pair<const COutPoint, CCoinsCacheEntry>, - sizeof(std::pair<const COutPoint, CCoinsCacheEntry>) + sizeof(void*) * 4, - alignof(void*)>>; + sizeof(std::pair<const COutPoint, CCoinsCacheEntry>) + sizeof(void*) * 4>>; using CCoinsMapMemoryResource = CCoinsMap::allocator_type::ResourceType; |