Explicitly configure new clang-format-11 options

(cherry picked from commit 6c28834354e96890235addf13913fe02956fa78a)

diff --git a/.clang-format b/.clang-format
index 3ed176aeb7a24467752f4447b647df86dc38ae46..7137d8e008540705de31109dd8947dc31a94ba29 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -11,6 +11,7 @@ BraceWrapping:
   AfterFunction:   false # should also be MultiLine, but not yet supported
   AfterExternBlock: false
   BeforeElse:      false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
 AllowShortIfStatementsOnASingleLine: false
@@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All
 Cpp11BracedListStyle: false
 ColumnLimit: 80
 AlignAfterOpenBracket: Align
+AlignConsecutiveBitFields: true
 AlignConsecutiveDeclarations: false
 AlignConsecutiveMacros: true
 AlignTrailingComments: true
@@ -62,6 +64,7 @@ IncludeCategories:
     Priority:        1
   - Regex:           '.*'
     Priority:        0
+IndentExternBlock: NoIndent
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30

diff --git a/.clang-format.headers b/.clang-format.headers
index a488e811f4db3daf07b385c3433325ce84fd25ea..b536276e7ce10e1bf5eaf4e78ce12f3f5ea31d10 100644 (file)
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -11,6 +11,7 @@ BraceWrapping:
   AfterFunction:   false # should also be MultiLine, but not yet supported
   AfterExternBlock: false
   BeforeElse:      false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction: true
 AllowShortIfStatementsOnASingleLine: false
@@ -19,6 +20,7 @@ AlwaysBreakAfterReturnType: All
 Cpp11BracedListStyle: false
 ColumnLimit: 80
 AlignAfterOpenBracket: Align
+AlignConsecutiveBitFields: true
 AlignConsecutiveDeclarations: true
 AlignConsecutiveMacros: true
 AlignTrailingComments: true
@@ -50,6 +52,7 @@ IncludeCategories:
     Priority:        1
   - Regex:           '".*"'
     Priority:        9
+IndentExternBlock: NoIndent
 KeepEmptyLinesAtTheStartOfBlocks: false
 MaxEmptyLinesToKeep: 1
 PenaltyBreakAssignment: 30