mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-11 04:12:36 -03:00
Merge bitcoin/bitcoin#25184: refactor: Remove defunct attributes.h includes
71a8dbe5da
refactor: Remove defunct attributes.h includes (Ben Woosley) Pull request description: Since the removal of NODISCARD in81d5af42f4
, the only attributes.h def is LIFETIMEBOUND, and it's included in many more places that it is used. This removes all includes which do not have an associated use of LIFETIMEBOUND, and adds it to the following files, due to their use of the same: * src/validationinterface.h * src/script/standard.h See also #20499. Top commit has no ACKs. Tree-SHA512: f3e10a5cda5ab78371b77b702f4a241ff69d490a16cc6059f1a4202b97c584accdbc951cc7b6120eae94bee3b9249e9117b45cf6ed1a5228ca23b5638fcf7b7b
This commit is contained in:
commit
66e3b16b8b
16 changed files with 2 additions and 14 deletions
|
@ -14,7 +14,6 @@
|
|||
#ifndef BITCOIN_BASE58_H
|
||||
#define BITCOIN_BASE58_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <span.h>
|
||||
|
||||
#include <string>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#define BITCOIN_CORE_IO_H
|
||||
|
||||
#include <consensus/amount.h>
|
||||
#include <attributes.h>
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#ifndef BITCOIN_HASH_H
|
||||
#define BITCOIN_HASH_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <crypto/common.h>
|
||||
#include <crypto/ripemd160.h>
|
||||
#include <crypto/sha256.h>
|
||||
|
|
|
@ -86,7 +86,6 @@
|
|||
#include <vector>
|
||||
|
||||
#ifndef WIN32
|
||||
#include <attributes.h>
|
||||
#include <cerrno>
|
||||
#include <signal.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include <config/bitcoin-config.h>
|
||||
#endif
|
||||
|
||||
#include <attributes.h>
|
||||
#include <compat.h>
|
||||
#include <crypto/siphash.h>
|
||||
#include <prevector.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef BITCOIN_NODE_TRANSACTION_H
|
||||
#define BITCOIN_NODE_TRANSACTION_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <primitives/transaction.h>
|
||||
#include <util/error.h>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#ifndef BITCOIN_OUTPUTTYPE_H
|
||||
#define BITCOIN_OUTPUTTYPE_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <script/signingprovider.h>
|
||||
#include <script/standard.h>
|
||||
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef BITCOIN_PSBT_H
|
||||
#define BITCOIN_PSBT_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <node/transaction.h>
|
||||
#include <policy/feerate.h>
|
||||
#include <primitives/transaction.h>
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
#ifndef BITCOIN_SCRIPT_STANDARD_H
|
||||
#define BITCOIN_SCRIPT_STANDARD_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <pubkey.h>
|
||||
#include <script/interpreter.h>
|
||||
#include <uint256.h>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#include <attributes.h>
|
||||
#include <clientversion.h>
|
||||
#include <coins.h>
|
||||
#include <script/standard.h>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
#define BITCOIN_TEST_FUZZ_UTIL_H
|
||||
|
||||
#include <arith_uint256.h>
|
||||
#include <attributes.h>
|
||||
#include <chainparamsbase.h>
|
||||
#include <coins.h>
|
||||
#include <compat.h>
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#ifndef BITCOIN_UTIL_BIP32_H
|
||||
#define BITCOIN_UTIL_BIP32_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#ifndef BITCOIN_UTIL_MONEYSTR_H
|
||||
#define BITCOIN_UTIL_MONEYSTR_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <consensus/amount.h>
|
||||
|
||||
#include <optional>
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#ifndef BITCOIN_UTIL_STRENCODINGS_H
|
||||
#define BITCOIN_UTIL_STRENCODINGS_H
|
||||
|
||||
#include <attributes.h>
|
||||
#include <span.h>
|
||||
#include <util/string.h>
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
#include <config/bitcoin-config.h>
|
||||
#endif
|
||||
|
||||
#include <attributes.h>
|
||||
#include <compat.h>
|
||||
#include <compat/assumptions.h>
|
||||
#include <fs.h>
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include <validationinterface.h>
|
||||
|
||||
#include <attributes.h>
|
||||
#include <chain.h>
|
||||
#include <consensus/validation.h>
|
||||
#include <logging.h>
|
||||
|
|
Loading…
Reference in a new issue