Skip to content

Commit 2a0f095

Browse files
committed
Fixing .clang-format to allow it to work with v10
On RHEL 8.3, the version of clang-format that Redhat provides is: > clang-format --version clang-format version 10.0.1 (Red Hat 10.0.1-1.module+el8.3.0+7459+90c24896) > git --version git v2.27.0 I tried to fix up master PR #8747 (master version of 8723) with the command: `git clang-format -v HEAD~1` but ran into some issues with clang-format v10.0.1 being able to parse the .clang-format file. I did not spend much time trying to find viable alternatives, instead I would just remove the offending line in the .clang-format file and rince/repeat. Are these options that we could do without, so that we could run clang-format with both v10 and v11? Signed-off-by: Geoffrey Paulsen <gpaulsen@us.ibm.com>
1 parent 92389c3 commit 2a0f095

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

.clang-format

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ AccessModifierOffset: -2
3333
AlignAfterOpenBracket: Align
3434
AlignConsecutiveMacros: true
3535
AlignConsecutiveAssignments: false
36-
AlignConsecutiveBitFields: false
3736
AlignConsecutiveDeclarations: false
3837
AlignEscapedNewlines: Left
3938
AlignOperands: true
4039
AlignTrailingComments: true
4140
AllowAllArgumentsOnNextLine: false
4241
AllowAllConstructorInitializersOnNextLine: true
4342
AllowAllParametersOfDeclarationOnNextLine: true
44-
AllowShortEnumsOnASingleLine: true
4543
AllowShortBlocksOnASingleLine: Never
4644
AllowShortCaseLabelsOnASingleLine: false
4745
AllowShortFunctionsOnASingleLine: None
@@ -67,8 +65,6 @@ BraceWrapping:
6765
AfterExternBlock: false
6866
BeforeCatch: false
6967
BeforeElse: false
70-
BeforeLambdaBody: false
71-
BeforeWhile: false
7268
IndentBraces: false
7369
SplitEmptyFunction: true
7470
SplitEmptyRecord: true
@@ -119,13 +115,10 @@ IncludeCategories:
119115
IncludeIsMainRegex: '(Test)?$'
120116
IncludeIsMainSourceRegex: ''
121117
IndentCaseLabels: false
122-
IndentCaseBlocks: false
123118
IndentGotoLabels: true
124119
IndentPPDirectives: AfterHash
125-
IndentExternBlock: AfterExternBlock
126120
IndentWidth: 4
127121
IndentWrappedFunctionNames: false
128-
InsertTrailingCommas: None
129122
JavaScriptQuotes: Leave
130123
JavaScriptWrapImports: true
131124
KeepEmptyLinesAtTheStartOfBlocks: true
@@ -135,7 +128,6 @@ MaxEmptyLinesToKeep: 1
135128
NamespaceIndentation: None
136129
ObjCBinPackProtocolList: Auto
137130
ObjCBlockIndentWidth: 4
138-
ObjCBreakBeforeNestedBlockParam: true
139131
ObjCSpaceAfterProperty: false
140132
ObjCSpaceBeforeProtocolList: true
141133
PenaltyBreakAssignment: 250
@@ -178,10 +170,4 @@ StatementMacros:
178170
TabWidth: 8
179171
UseCRLF: false
180172
UseTab: Never
181-
WhitespaceSensitiveMacros:
182-
- _STRINGIZE
183-
- STRINGIZE
184-
- PP_STRINGIZE
185-
- BOOST_PP_STRINGIZE
186173
...
187-

0 commit comments

Comments
 (0)