diff options
author | Brad King <brad.king@kitware.com> | 2017-11-28 15:45:44 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-11-28 15:50:44 (GMT) |
commit | 923b8fadd5fe6af56197cf3916a3292b60c0e8db (patch) | |
tree | 17d0031fb3f2e57184760b7a9a6274c26754c65a | |
parent | 8b5ae1c1d310fc6eb13b2cde5712b4e319f01f3e (diff) | |
download | CMake-923b8fadd5fe6af56197cf3916a3292b60c0e8db.zip CMake-923b8fadd5fe6af56197cf3916a3292b60c0e8db.tar.gz CMake-923b8fadd5fe6af56197cf3916a3292b60c0e8db.tar.bz2 |
IWYU: Add mappings for std::enable_if on chrono durations
IWYU incorrectly classifies this internal STL type as not internal, and
suggests including `<type_traits>` for it. Work around the problem by
mapping the offending names to a file that we always include.
See include-what-you-use issue 434.
-rw-r--r-- | Source/CTest/cmCTestBuildHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestConfigureHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestCoverageHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmCTestUpdateHandler.cxx | 1 | ||||
-rw-r--r-- | Source/CTest/cmProcess.cxx | 1 | ||||
-rw-r--r-- | Utilities/IWYU/mapping.imp | 4 |
9 files changed, 4 insertions, 8 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index f25c9c3..79446e8 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -17,7 +17,6 @@ #include <set> #include <stdlib.h> #include <string.h> -#include <type_traits> static const char* cmCTestErrorMatches[] = { "^[Bb]us [Ee]rror", diff --git a/Source/CTest/cmCTestConfigureHandler.cxx b/Source/CTest/cmCTestConfigureHandler.cxx index ab77986..7c5b3b0 100644 --- a/Source/CTest/cmCTestConfigureHandler.cxx +++ b/Source/CTest/cmCTestConfigureHandler.cxx @@ -9,7 +9,6 @@ #include <chrono> #include <ostream> #include <string> -#include <type_traits> cmCTestConfigureHandler::cmCTestConfigureHandler() { diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index bbfe9bd..69cd08c 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -27,7 +27,6 @@ #include <sstream> #include <stdio.h> #include <stdlib.h> -#include <type_traits> #include <utility> class cmMakefile; diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 2e7874d..57d2489 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -14,7 +14,6 @@ #include <iostream> #include <sstream> #include <string.h> -#include <type_traits> struct CatToErrorType { diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 3bf27a0..d2ad8c5 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -10,7 +10,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <type_traits> #include <utility> #include "cmCTest.h" diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index e7c719c..6d8180c 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -16,7 +16,6 @@ #include <stdlib.h> #include <string.h> #include <time.h> -#include <type_traits> #include "cmAlgorithms.h" #include "cmCTest.h" diff --git a/Source/CTest/cmCTestUpdateHandler.cxx b/Source/CTest/cmCTestUpdateHandler.cxx index f86d4a3..809abd1 100644 --- a/Source/CTest/cmCTestUpdateHandler.cxx +++ b/Source/CTest/cmCTestUpdateHandler.cxx @@ -20,7 +20,6 @@ #include <chrono> #include <memory> // IWYU pragma: keep #include <sstream> -#include <type_traits> static const char* cmCTestUpdateHandlerUpdateStrings[] = { "Unknown", "CVS", "SVN", "BZR", "GIT", "HG", "P4" diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index 78dd598..c889174 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -4,7 +4,6 @@ #include "cmProcessOutput.h" #include <iostream> -#include <type_traits> cmProcess::cmProcess() { diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp index 6477d59..221da06 100644 --- a/Utilities/IWYU/mapping.imp +++ b/Utilities/IWYU/mapping.imp @@ -63,6 +63,10 @@ { symbol: [ "std::__decay_and_strip<const std::basic_string<char> &>::__type", private, "\"cmConfigure.h\"", public ] }, { symbol: [ "std::__decay_and_strip<cmFindPackageCommand::PathLabel &>::__type", private, "\"cmConfigure.h\"", public ] }, { symbol: [ "std::__decay_and_strip<__gnu_cxx::__normal_iterator<const cmCTestTestHandler::cmCTestTestProperties *, std::vector<cmCTestTestHandler::cmCTestTestProperties, std::allocator<cmCTestTestHandler::cmCTestTestProperties> > > &>::__type", private, "\"cmConfigure.h\"", public ] }, + { symbol: [ "std::__success_type<std::chrono::duration<double, std::ratio<1, 1> > >::type", private, "\"cmConfigure.h\"", public ] }, + { symbol: [ "std::enable_if<true, std::chrono::duration<long, std::ratio<1, 1> > >::type", private, "\"cmConfigure.h\"", public ] }, + { symbol: [ "std::enable_if<true, std::chrono::duration<long, std::ratio<60, 1> > >::type", private, "\"cmConfigure.h\"", public ] }, + { symbol: [ "std::enable_if<true, std::chrono::duration<long, std::ratio<1, 1000> > >::type", private, "\"cmConfigure.h\"", public ] }, # KWIML { include: [ "<stdint.h>", public, "\"cm_kwiml.h\"", public ] }, |