Merge topic 'clang-format-9'

af7567342 clang-format: reformat the repository with clang-format-9
72f76d235 clang-format: update configuration for 9.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2216
This commit is contained in:
Ben Boeckel 2020-08-24 17:56:50 +00:00 committed by Kitware Robot
commit 1ea2e77ec2
2 changed files with 9 additions and 7 deletions

@ -1,17 +1,19 @@
--- ---
# This configuration requires clang-format 3.8 or higher. # This configuration requires clang-format 9 or higher.
BasedOnStyle: Mozilla BasedOnStyle: Mozilla
AlignAfterOpenBracket: Align AlignAfterOpenBracket: Align
AlignEscapedNewlines: true
AlignOperands: false AlignOperands: false
AlwaysBreakAfterReturnType: None AllowAllParametersOfDeclarationOnNextLine: false
AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterDefinitionReturnType: None
BreakBeforeBraces: Allman AlwaysBreakAfterReturnType: None
BinPackArguments: false BinPackArguments: false
BinPackParameters: false BinPackParameters: false
BreakBeforeBraces: Allman
ColumnLimit: 100 ColumnLimit: 100
# FixNamespaceComments: true
MaxEmptyLinesToKeep: 4 MaxEmptyLinesToKeep: 4
Standard: Cpp11
# This requires clang-format 4.0 (at least).
#FixNamespaceComments: true
ReflowComments: false ReflowComments: false
SpaceAfterTemplateKeyword: true
Standard: Cpp11
... ...

2
.gitattributes vendored

@ -1,5 +1,5 @@
# Attributes used for formatting. # Attributes used for formatting.
[attr]our-c-style whitespace=tab-in-indent format.clang-format [attr]our-c-style whitespace=tab-in-indent format.clang-format=9
*.cxx our-c-style *.cxx our-c-style
*.h our-c-style *.h our-c-style