diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-10 15:38:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-10 15:48:56 (GMT) |
| commit | 71fbebd1dc3a24e2478bb5704d9ac20f36cbf704 (patch) | |
| tree | dc884b3c88488e3aecf3c1676ad404bbc6756587 /Source/CPack | |
| parent | 4fc10431f06a07cd7ac1fafa7f3a8e633bea204c (diff) | |
| download | CMake-71fbebd1dc3a24e2478bb5704d9ac20f36cbf704.zip CMake-71fbebd1dc3a24e2478bb5704d9ac20f36cbf704.tar.gz CMake-71fbebd1dc3a24e2478bb5704d9ac20f36cbf704.tar.bz2 | |
IWYU: Fix handling of <memory> standard header
An old workaround for `std::allocator_traits<>::value_type` lints from
IWYU on `std::vector<>` usage breaks IWYU's handling of `<memory>`.
Convert the workaround to use the same approach we already use for a
workaround of `std::__decay_and_strip<>::::__type` lints. Then update
the `<memory>` inclusions to follow the now-correct IWYU lints.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/cpack.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 7e07ff4..4a91698 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -7,7 +7,7 @@ #include "cmsys/RegularExpression.hxx" #include <algorithm> #include <cstring> -#include <memory> // IWYU pragma: keep +#include <memory> #include <utility> #include "cmCPackComponentGroup.h" diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index 58b9e70..67b7ea6 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -5,7 +5,6 @@ #include "cmsys/Encoding.hxx" #include <iostream> #include <map> -#include <memory> // IWYU pragma: keep #include <sstream> #include <stddef.h> #include <string> |