Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 <[email protected]>
  • Loading branch information
gpaulsen committed Mar 31, 2021
commit 2a0f09514252799f2b9e673babaa639758c34306
14 changes: 0 additions & 14 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveMacros: true
AlignConsecutiveAssignments: false
AlignConsecutiveBitFields: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: false
AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
Expand All @@ -67,8 +65,6 @@ BraceWrapping:
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
Expand Down Expand Up @@ -119,13 +115,10 @@ IncludeCategories:
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentCaseLabels: false
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: AfterHash
IndentExternBlock: AfterExternBlock
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertTrailingCommas: None
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
Expand All @@ -135,7 +128,6 @@ MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 4
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 250
Expand Down Expand Up @@ -178,10 +170,4 @@ StatementMacros:
TabWidth: 8
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- _STRINGIZE
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
...