Skip to content

Commit 1eed88a

Browse files
committed
Merge bitcoin/bitcoin#34460: iwyu: Update mappings
9c839aa iwyu: Document mappings for libc symbols (Hennadii Stepanov) 9182464 iwyu: Add temporary mapping to work around upstream bug (Hennadii Stepanov) 37de7d1 iwyu: Drop backported mapping (Hennadii Stepanov) Pull request description: This PR: 1. Removes mappings that have been [backported](include-what-you-use/include-what-you-use#1706) upstream. 2. Adds a new temporary mapping to work around upstream [issue](include-what-you-use/include-what-you-use#1616). 3. Document the existing mappings for libc symbols. ACKs for top commit: maflcko: lgtm ACK 9c839aa sedited: ACK 9c839aa Tree-SHA512: 691fd9fc6798951ca1a621ee607a617ebef2ed2f43196465c78c6cd7a5ea7f0f0e876e68cd54653edf9b6762ae5fdb704469a1524a5f6f1ab8b0eedbff65cc28
2 parents 101daa4 + 9c839aa commit 1eed88a

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

contrib/devtools/iwyu/bitcoin.core.imp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
{ "include": [ "<tmmintrin.h>", "private", "<immintrin.h>", "public" ] },
77

88
# libc symbols.
9+
# See: https://github.com/include-what-you-use/include-what-you-use/issues/1809.
910
{ "symbol": ["AT_HWCAP", "private", "<sys/auxv.h>", "public"] },
1011
{ "symbol": ["AT_HWCAP2", "private", "<sys/auxv.h>", "public"] },
1112

12-
# Fixed in https://github.com/include-what-you-use/include-what-you-use/pull/1706.
13-
{ "symbol": ["SEEK_CUR", "private", "<cstdio>", "public"] },
14-
{ "symbol": ["SEEK_END", "private", "<cstdio>", "public"] },
15-
{ "symbol": ["SEEK_SET", "private", "<cstdio>", "public"] },
16-
17-
# IWYU bug.
13+
# Workarounds for IWYU issues.
14+
# See: https://github.com/include-what-you-use/include-what-you-use/issues/1616.
15+
{ "symbol": ["std::pair", "private", "<utility>", "public"] },
1816
# See: https://github.com/include-what-you-use/include-what-you-use/issues/1863.
1917
{ "symbol": ["std::vector", "private", "<vector>", "public"] },
2018
]

src/crypto/chacha20.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <array>
99
#include <cstddef>
1010
#include <cstdint>
11-
#include <iterator>
1211
#include <span>
1312
#include <utility>
1413

src/index/txindex.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <cstdint>
2525
#include <cstdio>
2626
#include <exception>
27-
#include <iterator>
2827
#include <span>
2928
#include <string>
3029
#include <utility>

0 commit comments

Comments
 (0)