diff options
| author | fanquake <fanquake@gmail.com> | 2023-02-16 15:57:28 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-16 16:01:41 +0000 |
| commit | 0567787f5ef9e45f96cb375dcd7e06117a9fd629 (patch) | |
| tree | 9372684c0336e77b1c793d611a41b253cef1f751 /src/support/lockedpool.h | |
| parent | dd04f2dda5fa9bd60a665ec11761669ca78421e8 (diff) | |
| parent | 52376d9217060ce84e992e374d5dc2beae40bb06 (diff) | |
| download | bitcoin-0567787f5ef9e45f96cb375dcd7e06117a9fd629.tar.xz | |
Merge bitcoin/bitcoin#26921: [23.x] Backports
52376d9217060ce84e992e374d5dc2beae40bb06 depends: fix systemtap download URL (fanquake)
af862661654966d5de614755ab9bd1b5913e0959 23.x Add missing includes to fix gcc-13 compile error (fanquake)
398768769f85cc1b6ff212ed931646b59fa1acd6 Add missing includes to fix gcc-13 compile error (MarcoFalke)
412cd1a34e035c1a2f35f4b4ac14eb192835950c addrdb: Only call Serialize() once (Martin Zumsande)
fd94befbc62e5f6b93f87979cc2011508378043d hash: add HashedSourceWriter (Martin Zumsande)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/26909
* https://github.com/bitcoin/bitcoin/pull/26924
* https://github.com/bitcoin/bitcoin/pull/26944
ACKs for top commit:
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/26921/commits/52376d9217060ce84e992e374d5dc2beae40bb06
Tree-SHA512: fa6463d5086667107b4ce4d87545e0b3f9b7841a52761a4dc6286377f958ecc026ed6694d1cf1e91cbad686309b5d637608f3991c46a20b02421318a804ffcea
Diffstat (limited to 'src/support/lockedpool.h')
| -rw-r--r-- | src/support/lockedpool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h index 03e4e371a3..66fbc218ab 100644 --- a/src/support/lockedpool.h +++ b/src/support/lockedpool.h @@ -5,11 +5,11 @@ #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H #define BITCOIN_SUPPORT_LOCKEDPOOL_H -#include <stdint.h> +#include <cstddef> #include <list> #include <map> -#include <mutex> #include <memory> +#include <mutex> #include <unordered_map> /** |