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/CTest | |
| 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/CTest')
| -rw-r--r-- | Source/CTest/cmCTestLaunch.cxx | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestMultiProcessHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestRunTest.h | 3 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index a96513e..237ca82 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -6,7 +6,6 @@ #include "cmsys/Process.h" #include "cmsys/RegularExpression.hxx" #include <iostream> -#include <memory> // IWYU pragma: keep #include <stdlib.h> #include <string.h> diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index ef63073..37a8abf 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -29,11 +29,13 @@ #include <iostream> #include <list> #include <math.h> +#include <memory> #include <sstream> #include <stack> #include <stdlib.h> #include <unordered_map> #include <utility> +#include <vector> namespace cmsys { class RegularExpression; diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index 38cc417..43dfe8e 100644 --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@ -5,6 +5,7 @@ #include "cmConfigure.h" // IWYU pragma: keep +#include <memory> #include <set> #include <stddef.h> #include <string> @@ -12,7 +13,7 @@ #include "cmCTestTestHandler.h" #include "cmDuration.h" -#include "cmProcess.h" // IWYU pragma: keep (for unique_ptr) +#include "cmProcess.h" class cmCTest; class cmCTestMultiProcessHandler; diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 0ed56c8..46ef809 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -11,7 +11,7 @@ #include <functional> #include <iomanip> #include <iterator> -#include <memory> // IWYU pragma: keep +#include <memory> #include <set> #include <sstream> #include <stdio.h> diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index 5cfc4a7..fb97e9b 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -18,7 +18,7 @@ #include "cmXMLWriter.h" #include <chrono> -#include <memory> // IWYU pragma: keep +#include <memory> #include <sstream> static const char* cmCTestUpdateHandlerUpdateStrings[] = { |