Skip to content
Snippets Groups Projects
Commit 2a0f0951 authored by Geoffrey Paulsen's avatar Geoffrey Paulsen
Browse files

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: default avatarGeoffrey Paulsen <gpaulsen@us.ibm.com>
parent 92389c36
Branches
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ AccessModifierOffset: -2 ...@@ -33,7 +33,6 @@ AccessModifierOffset: -2
AlignAfterOpenBracket: Align AlignAfterOpenBracket: Align
AlignConsecutiveMacros: true AlignConsecutiveMacros: true
AlignConsecutiveAssignments: false AlignConsecutiveAssignments: false
AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: false AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left AlignEscapedNewlines: Left
AlignOperands: true AlignOperands: true
...@@ -41,7 +40,6 @@ AlignTrailingComments: true ...@@ -41,7 +40,6 @@ AlignTrailingComments: true
AllowAllArgumentsOnNextLine: false AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: true AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None AllowShortFunctionsOnASingleLine: None
...@@ -67,8 +65,6 @@ BraceWrapping: ...@@ -67,8 +65,6 @@ BraceWrapping:
AfterExternBlock: false AfterExternBlock: false
BeforeCatch: false BeforeCatch: false
BeforeElse: false BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false IndentBraces: false
SplitEmptyFunction: true SplitEmptyFunction: true
SplitEmptyRecord: true SplitEmptyRecord: true
...@@ -119,13 +115,10 @@ IncludeCategories: ...@@ -119,13 +115,10 @@ IncludeCategories:
IncludeIsMainRegex: '(Test)?$' IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: '' IncludeIsMainSourceRegex: ''
IndentCaseLabels: false IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true IndentGotoLabels: true
IndentPPDirectives: AfterHash IndentPPDirectives: AfterHash
IndentExternBlock: AfterExternBlock
IndentWidth: 4 IndentWidth: 4
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave JavaScriptQuotes: Leave
JavaScriptWrapImports: true JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true KeepEmptyLinesAtTheStartOfBlocks: true
...@@ -135,7 +128,6 @@ MaxEmptyLinesToKeep: 1 ...@@ -135,7 +128,6 @@ MaxEmptyLinesToKeep: 1
NamespaceIndentation: None NamespaceIndentation: None
ObjCBinPackProtocolList: Auto ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 4 ObjCBlockIndentWidth: 4
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 250 PenaltyBreakAssignment: 250
...@@ -178,10 +170,4 @@ StatementMacros: ...@@ -178,10 +170,4 @@ StatementMacros:
TabWidth: 8 TabWidth: 8
UseCRLF: false UseCRLF: false
UseTab: Never UseTab: Never
WhitespaceSensitiveMacros:
- _STRINGIZE
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
... ...
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment