diff options
| author | fanquake <fanquake@gmail.com> | 2023-02-16 15:34:23 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-02-16 15:42:48 +0000 |
| commit | a896f61290fb6d2dabc029288607f30b52d6dfe0 (patch) | |
| tree | 6ac61e931a6b2f09b3cc752ff0e4314a5489becc | |
| parent | 6fd35e2cb18d325221644a33b058c109aed3e767 (diff) | |
| parent | ea584a617c6853eb1f9740600cd9db75d77948eb (diff) | |
Merge bitcoin/bitcoin#26927: [22.x] Backportsv22-final
ea584a617c6853eb1f9740600cd9db75d77948eb 23.x Add missing includes to fix gcc-13 compile error (fanquake)
c21e6a9ce210e0b0d1f4081ebd5dfefbe3c7af2d Add missing includes to fix gcc-13 compile error (MarcoFalke)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/26924
ACKs for top commit:
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/26927/commits/ea584a617c6853eb1f9740600cd9db75d77948eb
Tree-SHA512: e231d2e3e17f884eb9eb63f2f31829cef3e64351c9d6b90abeef421c366cef228a0a87b9c3a07c840879bd514ebe33b554fb62947c13bd05806865e59323cae7
| -rw-r--r-- | src/support/lockedpool.cpp | 3 | ||||
| -rw-r--r-- | src/support/lockedpool.h | 4 | ||||
| -rw-r--r-- | src/util/bip32.h | 1 | ||||
| -rw-r--r-- | src/util/string.h | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp index 6965f40253..2ad3161563 100644 --- a/src/support/lockedpool.cpp +++ b/src/support/lockedpool.cpp @@ -22,6 +22,9 @@ #endif #include <algorithm> +#include <limits> +#include <stdexcept> +#include <utility> #ifdef ARENA_DEBUG #include <iomanip> #include <iostream> 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> /** diff --git a/src/util/bip32.h b/src/util/bip32.h index 8f86f2aaa6..b1d53616a4 100644 --- a/src/util/bip32.h +++ b/src/util/bip32.h @@ -6,6 +6,7 @@ #define BITCOIN_UTIL_BIP32_H #include <attributes.h> +#include <cstdint> #include <string> #include <vector> diff --git a/src/util/string.h b/src/util/string.h index b26facc502..ca53c7ce43 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -9,6 +9,7 @@ #include <algorithm> #include <array> +#include <cstdint> #include <cstring> #include <locale> #include <sstream> |