diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-01-06 17:44:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-06 17:44:49 (GMT) |
| commit | 9abe670cd74d87a5702e95dc3ec4913752b58ef9 (patch) | |
| tree | 7c6eee7e99942a2934b582c03570f08cd6c117fe | |
| parent | e1f632cea05b726dcf1e19d55b5549f422dbbe1d (diff) | |
| parent | a8aa89352a448fe9290532ad7b1d24d7e1b5e21e (diff) | |
| download | CMake-9abe670cd74d87a5702e95dc3ec4913752b58ef9.zip CMake-9abe670cd74d87a5702e95dc3ec4913752b58ef9.tar.gz CMake-9abe670cd74d87a5702e95dc3ec4913752b58ef9.tar.bz2 | |
Merge topic 'clang-format-headers-sort'
a8aa89352a clang-format: fix erroneous handling of header <queue>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4182
| -rw-r--r-- | .clang-format | 2 | ||||
| -rw-r--r-- | Source/cmComputeLinkDepends.h | 3 | ||||
| -rw-r--r-- | Source/cmDependsC.h | 3 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index a7f049a..4bfce44 100644 --- a/.clang-format +++ b/.clang-format @@ -22,6 +22,8 @@ IncludeBlocks: Regroup IncludeCategories: - Regex: '^[<"]cmConfigure\.h' Priority: -1 + - Regex: '^<queue>' + Priority: 1 - Regex: '^(<|")cm(ext)?/' Priority: 2 - Regex: '^(<|")windows\.h' diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 645189a..47c821b 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -7,12 +7,11 @@ #include <map> #include <memory> +#include <queue> #include <set> #include <string> #include <vector> -#include <queue> - #include "cmGraphAdjacencyList.h" #include "cmLinkItem.h" #include "cmTargetLinkLibraryType.h" diff --git a/Source/cmDependsC.h b/Source/cmDependsC.h index 3bb6e36..868c94a 100644 --- a/Source/cmDependsC.h +++ b/Source/cmDependsC.h @@ -7,12 +7,11 @@ #include <iosfwd> #include <map> +#include <queue> #include <set> #include <string> #include <vector> -#include <queue> - #include "cmsys/RegularExpression.hxx" #include "cmDepends.h" diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 927364d..523083a 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -10,6 +10,7 @@ #include <cstdlib> #include <cstring> #include <iterator> +#include <queue> #include <sstream> #include <unordered_set> #include <utility> @@ -17,8 +18,6 @@ #include <cm/memory> #include <cm/string_view> -#include <queue> - #include "cmsys/RegularExpression.hxx" #include "cmAlgorithms.h" |