diff options
| author | fanquake <fanquake@gmail.com> | 2022-11-22 09:52:29 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-11-22 09:52:53 +0000 |
| commit | 1b680948d43b1d39645b9d839a6fa7c6c1786b51 (patch) | |
| tree | 8de07159a6ca524a6ce25daeb7bac732497b9c5f /src/test | |
| parent | 542a2b567d549b70b1bf37b57888d25c304dd2a0 (diff) | |
| parent | b89530483d39f6a6a777df590b87ba2fad8c8b60 (diff) | |
| download | bitcoin-1b680948d43b1d39645b9d839a6fa7c6c1786b51.tar.xz | |
Merge bitcoin/bitcoin#26292: util: move threadinterrupt into util/
b89530483d39f6a6a777df590b87ba2fad8c8b60 util: move threadinterrupt into util (fanquake)
Pull request description:
Alongside thread and threadnames. It's part of libbitcoin_util.
ACKs for top commit:
ryanofsky:
Code review ACK b89530483d39f6a6a777df590b87ba2fad8c8b60. No changes since last review other than rebase
theuni:
ACK b89530483d39f6a6a777df590b87ba2fad8c8b60.
Tree-SHA512: 0421f4d1881ec295272446804b27d16bf63e6b62b272f8bb52bfecde9ae6605e8109ed16294690d3e3ce4b15cc5e7c4046f99442df73adb10bdf069d3fb165aa
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/fuzz/i2p.cpp | 2 | ||||
| -rw-r--r-- | src/test/i2p_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/sock_tests.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/fuzz/i2p.cpp b/src/test/fuzz/i2p.cpp index fb6d23aca5..b6e3ca07e2 100644 --- a/src/test/fuzz/i2p.cpp +++ b/src/test/fuzz/i2p.cpp @@ -9,8 +9,8 @@ #include <test/fuzz/fuzz.h> #include <test/fuzz/util.h> #include <test/util/setup_common.h> -#include <threadinterrupt.h> #include <util/system.h> +#include <util/threadinterrupt.h> void initialize_i2p() { diff --git a/src/test/i2p_tests.cpp b/src/test/i2p_tests.cpp index 9da1ee11f9..7b1bf11cfb 100644 --- a/src/test/i2p_tests.cpp +++ b/src/test/i2p_tests.cpp @@ -8,8 +8,8 @@ #include <test/util/logging.h> #include <test/util/net.h> #include <test/util/setup_common.h> -#include <threadinterrupt.h> #include <util/system.h> +#include <util/threadinterrupt.h> #include <boost/test/unit_test.hpp> diff --git a/src/test/sock_tests.cpp b/src/test/sock_tests.cpp index 8376ec1a68..5bea08c254 100644 --- a/src/test/sock_tests.cpp +++ b/src/test/sock_tests.cpp @@ -4,9 +4,9 @@ #include <compat/compat.h> #include <test/util/setup_common.h> -#include <threadinterrupt.h> #include <util/sock.h> #include <util/system.h> +#include <util/threadinterrupt.h> #include <boost/test/unit_test.hpp> |