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
This commit is contained in:
Marc Chevrier
2020-01-06 17:44:40 +00:00
committed by Kitware Robot
4 changed files with 5 additions and 6 deletions

View File

@@ -22,6 +22,8 @@ IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^[<"]cmConfigure\.h'
Priority: -1
- Regex: '^<queue>'
Priority: 1
- Regex: '^(<|")cm(ext)?/'
Priority: 2
- Regex: '^(<|")windows\.h'

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"