diff options
| author | Brad King <brad.king@kitware.com> | 2020-10-09 13:39:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-10-09 13:40:03 (GMT) |
| commit | 3fb2112880ca3be6299721f5add1928483de0b1b (patch) | |
| tree | 6da4307d0a83dc374efc62eb2074376cb852196c | |
| parent | 5f2e1f2f3dd2746b9f15413cdcf16ec6e851a2bb (diff) | |
| parent | 06c0d59c172abd699d48c3ddf883ccc6f723ae9c (diff) | |
| download | CMake-3fb2112880ca3be6299721f5add1928483de0b1b.zip CMake-3fb2112880ca3be6299721f5add1928483de0b1b.tar.gz CMake-3fb2112880ca3be6299721f5add1928483de0b1b.tar.bz2 | |
Merge topic 'iwyu-map-cm-headers' into release-3.19
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5327
| -rw-r--r-- | Tests/CMakeLib/testCMFilesystemPath.cxx | 1 | ||||
| -rw-r--r-- | Utilities/IWYU/mapping.imp | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Tests/CMakeLib/testCMFilesystemPath.cxx b/Tests/CMakeLib/testCMFilesystemPath.cxx index ee0ef0b..579ba99 100644 --- a/Tests/CMakeLib/testCMFilesystemPath.cxx +++ b/Tests/CMakeLib/testCMFilesystemPath.cxx @@ -8,7 +8,6 @@ #include <vector> #include <cm/filesystem> -#include <cm/iomanip> namespace { diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index 66cb282..c2aced5 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -27,7 +27,7 @@ { include: [ "<bits/std_abs.h>", private, "<stdlib.h>", public ] }, { include: [ "<bits/stdint-intn.h>", private, "<stdint.h>", public ] }, { include: [ "<bits/stdint-uintn.h>", private, "<stdint.h>", public ] }, - { include: [ "<bits/string_view.tcc>", private, "<string_view>", public ] }, + { include: [ "<bits/string_view.tcc>", private, "<string_view>", private ] }, { include: [ "<bits/time.h>", private, "<time.h>", public ] }, { include: [ "<bits/types/clock_t.h>", private, "<time.h>", public ] }, { include: [ "<bits/types/mbstate_t.h>", private, "<wchar.h>", public ] }, @@ -116,6 +116,11 @@ { include: [ "<ostream>", public, "\"cmsys/FStream.hxx\"", public ] }, { include: [ "<fstream>", public, "\"cmsys/FStream.hxx\"", public ] }, + { include: [ "<filesystem>", private, "<cm/filesystem>", public ] }, + { include: [ "<optional>", private, "<cm/optional>", public ] }, + { include: [ "<shared_mutex>", private, "<cm/shared_mutex>", public ] }, + { include: [ "<string_view>", private, "<cm/string_view>", public ] }, + # major and minor are used as macro arguments. Those are false matches. { symbol: [ "major", private, "\"cmVersion.h\"", public ] }, { symbol: [ "minor", private, "\"cmVersion.h\"", public ] }, |