Skip to content

Commit 548f6b8

Browse files
committed
Merge bitcoin/bitcoin#32562: doc: remove // for ... comments
7193245 doc: remove For ... comments (fanquake) 1b9cdc9 net: drop win32 ifdef (fanquake) 19ba499 init: cerrno is used on all platforms (fanquake) Pull request description: We don't add or maintain these, and they are of little value, as well as having the effect of polluting diffs, if changed. They are also wrong, i.e `DEFAULT_SCRIPTCHECK_THREADS` is not in `validation.h`. ACKs for top commit: stickies-v: re-ACK 7193245 fjahr: ACK 7193245 willcl-ark: reACK 7193245 Tree-SHA512: 6b5f83cd1df699356e1cbb78949f8d456b13ce288f0064138118cfb45b4c77e2d1945babe91598dffe9823ab07dfae36f4c3b61c586cf98baf16890bdf322b08
2 parents 7c87a0e + 7193245 commit 548f6b8

28 files changed

+117
-92
lines changed

src/banman.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2022 The Bitcoin Core developers
2+
// Copyright (c) 2009-present The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
#ifndef BITCOIN_BANMAN_H
66
#define BITCOIN_BANMAN_H
77

88
#include <addrdb.h>
99
#include <common/bloom.h>
10-
#include <net_types.h> // For banmap_t
10+
#include <net_types.h>
1111
#include <sync.h>
1212
#include <util/fs.h>
1313

src/common/args.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2022 The Bitcoin Core developers
2+
// Copyright (c) 2009-present The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -19,9 +19,9 @@
1919
#include <util/string.h>
2020

2121
#ifdef WIN32
22-
#include <codecvt> /* for codecvt_utf8_utf16 */
23-
#include <shellapi.h> /* for CommandLineToArgvW */
24-
#include <shlobj.h> /* for CSIDL_APPDATA */
22+
#include <codecvt>
23+
#include <shellapi.h>
24+
#include <shlobj.h>
2525
#endif
2626

2727
#include <algorithm>

src/crypto/sha3.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77

88
#include <crypto/sha3.h>
99
#include <crypto/common.h>
10-
#include <span.h>
1110

1211
#include <algorithm>
13-
#include <array> // For std::begin and std::end.
12+
#include <array>
1413
#include <bit>
15-
16-
#include <stdint.h>
14+
#include <cstdint>
15+
#include <span>
1716

1817
void KeccakF(uint64_t (&st)[25])
1918
{

src/cuckoocache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <util/fastrange.h>
99

10-
#include <algorithm> // std::find
10+
#include <algorithm>
1111
#include <array>
1212
#include <atomic>
1313
#include <cmath>

src/headerssync.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2022 The Bitcoin Core developers
1+
// Copyright (c) 2022-present The Bitcoin Core developers
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -8,7 +8,7 @@
88
#include <arith_uint256.h>
99
#include <chain.h>
1010
#include <consensus/params.h>
11-
#include <net.h> // For NodeId
11+
#include <net.h>
1212
#include <primitives/block.h>
1313
#include <uint256.h>
1414
#include <util/bitdeque.h>

src/httpserver.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2015-2022 The Bitcoin Core developers
1+
// Copyright (c) 2015-present The Bitcoin Core developers
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -11,7 +11,7 @@
1111
#include <logging.h>
1212
#include <netbase.h>
1313
#include <node/interface_ui.h>
14-
#include <rpc/protocol.h> // For HTTP status codes
14+
#include <rpc/protocol.h>
1515
#include <sync.h>
1616
#include <util/check.h>
1717
#include <util/signalinterrupt.h>
@@ -27,7 +27,9 @@
2727
#include <optional>
2828
#include <span>
2929
#include <string>
30+
#include <thread>
3031
#include <unordered_map>
32+
#include <vector>
3133

3234
#include <sys/types.h>
3335
#include <sys/stat.h>

src/index/base.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@
1717
#include <util/string.h>
1818
#include <util/thread.h>
1919
#include <util/translation.h>
20-
#include <validation.h> // For g_chainman
20+
#include <validation.h>
2121

22+
#include <chrono>
23+
#include <memory>
24+
#include <optional>
25+
#include <stdexcept>
2226
#include <string>
27+
#include <thread>
2328
#include <utility>
2429

2530
constexpr uint8_t DB_BEST_BLOCK{'B'};

src/init.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2009-2010 Satoshi Nakamoto
2-
// Copyright (c) 2009-2022 The Bitcoin Core developers
2+
// Copyright (c) 2009-present The Bitcoin Core developers
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

@@ -93,6 +93,7 @@
9393
#include <walletinitinterface.h>
9494

9595
#include <algorithm>
96+
#include <cerrno>
9697
#include <condition_variable>
9798
#include <cstdint>
9899
#include <cstdio>
@@ -104,7 +105,6 @@
104105
#include <vector>
105106

106107
#ifndef WIN32
107-
#include <cerrno>
108108
#include <signal.h>
109109
#include <sys/stat.h>
110110
#endif

src/interfaces/chain.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2018-2022 The Bitcoin Core developers
1+
// Copyright (c) 2018-present The Bitcoin Core developers
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

@@ -7,14 +7,15 @@
77

88
#include <blockfilter.h>
99
#include <common/settings.h>
10-
#include <primitives/transaction.h> // For CTransactionRef
10+
#include <primitives/transaction.h>
1111
#include <util/result.h>
1212

13+
#include <cstddef>
14+
#include <cstdint>
1315
#include <functional>
16+
#include <map>
1417
#include <memory>
1518
#include <optional>
16-
#include <stddef.h>
17-
#include <stdint.h>
1819
#include <string>
1920
#include <vector>
2021

src/interfaces/mining.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
// Copyright (c) 2024 The Bitcoin Core developers
1+
// Copyright (c) 2024-present The Bitcoin Core developers
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#ifndef BITCOIN_INTERFACES_MINING_H
66
#define BITCOIN_INTERFACES_MINING_H
77

8-
#include <consensus/amount.h> // for CAmount
9-
#include <interfaces/types.h> // for BlockRef
10-
#include <node/types.h> // for BlockCreateOptions, BlockWaitOptions
11-
#include <primitives/block.h> // for CBlock, CBlockHeader
12-
#include <primitives/transaction.h> // for CTransactionRef
13-
#include <stdint.h> // for int64_t
14-
#include <uint256.h> // for uint256
15-
#include <util/time.h> // for MillisecondsDouble
16-
17-
#include <memory> // for unique_ptr, shared_ptr
18-
#include <optional> // for optional
19-
#include <vector> // for vector
8+
#include <consensus/amount.h>
9+
#include <interfaces/types.h>
10+
#include <node/types.h>
11+
#include <primitives/block.h>
12+
#include <primitives/transaction.h>
13+
#include <uint256.h>
14+
#include <util/time.h>
15+
16+
#include <cstdint>
17+
#include <memory>
18+
#include <optional>
19+
#include <vector>
2020

2121
namespace node {
2222
struct NodeContext;

0 commit comments

Comments
 (0)