Skip to content

Commit 1a44534

Browse files
meshcollidermeshcollider
committed
scripted-diff: Replace #include "" with #include <> (ryanofsky)
-BEGIN VERIFY SCRIPT- for f in \ src/*.cpp \ src/*.h \ src/bench/*.cpp \ src/bench/*.h \ src/compat/*.cpp \ src/compat/*.h \ src/consensus/*.cpp \ src/consensus/*.h \ src/crypto/*.cpp \ src/crypto/*.h \ src/crypto/ctaes/*.h \ src/policy/*.cpp \ src/policy/*.h \ src/primitives/*.cpp \ src/primitives/*.h \ src/qt/*.cpp \ src/qt/*.h \ src/qt/test/*.cpp \ src/qt/test/*.h \ src/rpc/*.cpp \ src/rpc/*.h \ src/script/*.cpp \ src/script/*.h \ src/support/*.cpp \ src/support/*.h \ src/support/allocators/*.h \ src/test/*.cpp \ src/test/*.h \ src/wallet/*.cpp \ src/wallet/*.h \ src/wallet/test/*.cpp \ src/wallet/test/*.h \ src/zmq/*.cpp \ src/zmq/*.h do base=${f%/*}/ relbase=${base#src/} sed -i "s:#include \"\(.*\)\"\(.*\):if test -e \$base'\\1'; then echo \"#include <\"\$relbase\"\\1>\\2\"; else echo \"#include <\\1>\\2\"; fi:e" $f done -END VERIFY SCRIPT-
1 parent 4ed8180 commit 1a44534

File tree

355 files changed

+2046
-2046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

355 files changed

+2046
-2046
lines changed

Diff for: ‎src/addrdb.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "addrdb.h"
7-
8-
#include "addrman.h"
9-
#include "chainparams.h"
10-
#include "clientversion.h"
11-
#include "fs.h"
12-
#include "hash.h"
13-
#include "random.h"
14-
#include "streams.h"
15-
#include "tinyformat.h"
16-
#include "util.h"
6+
#include <addrdb.h>
7+
8+
#include <addrman.h>
9+
#include <chainparams.h>
10+
#include <clientversion.h>
11+
#include <fs.h>
12+
#include <hash.h>
13+
#include <random.h>
14+
#include <streams.h>
15+
#include <tinyformat.h>
16+
#include <util.h>
1717

1818
namespace {
1919

Diff for: ‎src/addrdb.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#ifndef BITCOIN_ADDRDB_H
77
#define BITCOIN_ADDRDB_H
88

9-
#include "fs.h"
10-
#include "serialize.h"
9+
#include <fs.h>
10+
#include <serialize.h>
1111

1212
#include <string>
1313
#include <map>

Diff for: ‎src/addrman.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "addrman.h"
6+
#include <addrman.h>
77

8-
#include "hash.h"
9-
#include "serialize.h"
10-
#include "streams.h"
8+
#include <hash.h>
9+
#include <serialize.h>
10+
#include <streams.h>
1111

1212
int CAddrInfo::GetTriedBucket(const uint256& nKey) const
1313
{

Diff for: ‎src/addrman.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#ifndef BITCOIN_ADDRMAN_H
77
#define BITCOIN_ADDRMAN_H
88

9-
#include "netaddress.h"
10-
#include "protocol.h"
11-
#include "random.h"
12-
#include "sync.h"
13-
#include "timedata.h"
14-
#include "util.h"
9+
#include <netaddress.h>
10+
#include <protocol.h>
11+
#include <random.h>
12+
#include <sync.h>
13+
#include <timedata.h>
14+
#include <util.h>
1515

1616
#include <map>
1717
#include <set>

Diff for: ‎src/arith_uint256.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include "arith_uint256.h"
6+
#include <arith_uint256.h>
77

8-
#include "uint256.h"
9-
#include "utilstrencodings.h"
10-
#include "crypto/common.h"
8+
#include <uint256.h>
9+
#include <utilstrencodings.h>
10+
#include <crypto/common.h>
1111

1212
#include <stdio.h>
1313
#include <string.h>

Diff for: ‎src/base58.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "base58.h"
5+
#include <base58.h>
66

7-
#include "bech32.h"
8-
#include "hash.h"
9-
#include "script/script.h"
10-
#include "uint256.h"
11-
#include "utilstrencodings.h"
7+
#include <bech32.h>
8+
#include <hash.h>
9+
#include <script/script.h>
10+
#include <uint256.h>
11+
#include <utilstrencodings.h>
1212

1313
#include <boost/variant/apply_visitor.hpp>
1414
#include <boost/variant/static_visitor.hpp>

Diff for: ‎src/base58.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#ifndef BITCOIN_BASE58_H
1515
#define BITCOIN_BASE58_H
1616

17-
#include "chainparams.h"
18-
#include "key.h"
19-
#include "pubkey.h"
20-
#include "script/standard.h"
21-
#include "support/allocators/zeroafterfree.h"
17+
#include <chainparams.h>
18+
#include <key.h>
19+
#include <pubkey.h>
20+
#include <script/standard.h>
21+
#include <support/allocators/zeroafterfree.h>
2222

2323
#include <string>
2424
#include <vector>

Diff for: ‎src/bech32.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bech32.h"
5+
#include <bech32.h>
66

77
namespace
88
{

Diff for: ‎src/bench/Examples.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "validation.h"
7-
#include "utiltime.h"
5+
#include <bench/bench.h>
6+
#include <validation.h>
7+
#include <utiltime.h>
88

99
// Sanity test: this should loop ten times, and
1010
// min/max/average should be close to 100ms.

Diff for: ‎src/bench/base58.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
5+
#include <bench/bench.h>
66

7-
#include "validation.h"
8-
#include "base58.h"
7+
#include <validation.h>
8+
#include <base58.h>
99

1010
#include <array>
1111
#include <vector>

Diff for: ‎src/bench/bench.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "perf.h"
5+
#include <bench/bench.h>
6+
#include <bench/perf.h>
77

88
#include <assert.h>
99
#include <iostream>

Diff for: ‎src/bench/bench_bitcoin.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
5+
#include <bench/bench.h>
66

7-
#include "crypto/sha256.h"
8-
#include "key.h"
9-
#include "validation.h"
10-
#include "util.h"
11-
#include "random.h"
7+
#include <crypto/sha256.h>
8+
#include <key.h>
9+
#include <validation.h>
10+
#include <util.h>
11+
#include <random.h>
1212

1313
int
1414
main(int argc, char** argv)

Diff for: ‎src/bench/ccoins_caching.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "coins.h"
7-
#include "policy/policy.h"
8-
#include "wallet/crypter.h"
5+
#include <bench/bench.h>
6+
#include <coins.h>
7+
#include <policy/policy.h>
8+
#include <wallet/crypter.h>
99

1010
#include <vector>
1111

Diff for: ‎src/bench/checkblock.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
5+
#include <bench/bench.h>
66

7-
#include "chainparams.h"
8-
#include "validation.h"
9-
#include "streams.h"
10-
#include "consensus/validation.h"
7+
#include <chainparams.h>
8+
#include <validation.h>
9+
#include <streams.h>
10+
#include <consensus/validation.h>
1111

1212
namespace block_bench {
13-
#include "bench/data/block413567.raw.h"
13+
#include <bench/data/block413567.raw.h>
1414
} // namespace block_bench
1515

1616
// These are the two major time-sinks which happen after we have fully received

Diff for: ‎src/bench/checkqueue.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "util.h"
7-
#include "validation.h"
8-
#include "checkqueue.h"
9-
#include "prevector.h"
5+
#include <bench/bench.h>
6+
#include <util.h>
7+
#include <validation.h>
8+
#include <checkqueue.h>
9+
#include <prevector.h>
1010
#include <vector>
1111
#include <boost/thread/thread.hpp>
12-
#include "random.h"
12+
#include <random.h>
1313

1414

1515
// This Benchmark tests the CheckQueue with the lightest

Diff for: ‎src/bench/coin_selection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "wallet/wallet.h"
5+
#include <bench/bench.h>
6+
#include <wallet/wallet.h>
77

88
#include <set>
99

Diff for: ‎src/bench/crypto_hash.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
#include <iostream>
66

7-
#include "bench.h"
8-
#include "bloom.h"
9-
#include "hash.h"
10-
#include "random.h"
11-
#include "uint256.h"
12-
#include "utiltime.h"
13-
#include "crypto/ripemd160.h"
14-
#include "crypto/sha1.h"
15-
#include "crypto/sha256.h"
16-
#include "crypto/sha512.h"
7+
#include <bench/bench.h>
8+
#include <bloom.h>
9+
#include <hash.h>
10+
#include <random.h>
11+
#include <uint256.h>
12+
#include <utiltime.h>
13+
#include <crypto/ripemd160.h>
14+
#include <crypto/sha1.h>
15+
#include <crypto/sha256.h>
16+
#include <crypto/sha512.h>
1717

1818
/* Number of bytes to hash per iteration */
1919
static const uint64_t BUFFER_SIZE = 1000*1000;

Diff for: ‎src/bench/lockedpool.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
5+
#include <bench/bench.h>
66

7-
#include "support/lockedpool.h"
7+
#include <support/lockedpool.h>
88

99
#include <iostream>
1010
#include <vector>

Diff for: ‎src/bench/mempool_eviction.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "policy/policy.h"
7-
#include "txmempool.h"
5+
#include <bench/bench.h>
6+
#include <policy/policy.h>
7+
#include <txmempool.h>
88

99
#include <list>
1010
#include <vector>

Diff for: ‎src/bench/perf.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "perf.h"
5+
#include <bench/perf.h>
66

77
#if defined(__i386__) || defined(__x86_64__)
88

Diff for: ‎src/bench/prevector_destructor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "prevector.h"
5+
#include <bench/bench.h>
6+
#include <prevector.h>
77

88
static void PrevectorDestructor(benchmark::State& state)
99
{

Diff for: ‎src/bench/rollingbloom.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
#include <iostream>
66

7-
#include "bench.h"
8-
#include "bloom.h"
7+
#include <bench/bench.h>
8+
#include <bloom.h>
99

1010
static void RollingBloom(benchmark::State& state)
1111
{

Diff for: ‎src/bench/verify_script.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include "bench.h"
6-
#include "key.h"
5+
#include <bench/bench.h>
6+
#include <key.h>
77
#if defined(HAVE_CONSENSUS_LIB)
8-
#include "script/bitcoinconsensus.h"
8+
#include <script/bitcoinconsensus.h>
99
#endif
10-
#include "script/script.h"
11-
#include "script/sign.h"
12-
#include "streams.h"
10+
#include <script/script.h>
11+
#include <script/sign.h>
12+
#include <streams.h>
1313

1414
#include <array>
1515

Diff for: ‎src/bitcoin-cli.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
#if defined(HAVE_CONFIG_H)
7-
#include "config/bitcoin-config.h"
7+
#include <config/bitcoin-config.h>
88
#endif
99

10-
#include "chainparamsbase.h"
11-
#include "clientversion.h"
12-
#include "fs.h"
13-
#include "rpc/client.h"
14-
#include "rpc/protocol.h"
15-
#include "util.h"
16-
#include "utilstrencodings.h"
10+
#include <chainparamsbase.h>
11+
#include <clientversion.h>
12+
#include <fs.h>
13+
#include <rpc/client.h>
14+
#include <rpc/protocol.h>
15+
#include <util.h>
16+
#include <utilstrencodings.h>
1717

1818
#include <stdio.h>
1919

2020
#include <event2/buffer.h>
2121
#include <event2/keyvalq_struct.h>
22-
#include "support/events.h"
22+
#include <support/events.h>
2323

2424
#include <univalue.h>
2525

0 commit comments

Comments
 (0)