diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-01-29 14:19:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 14:19:31 (GMT) |
| commit | 1bf8fa2665fd606d7c616eaa4223decfce2c25f2 (patch) | |
| tree | 71d16fc54d0bdd05ca8b85451026eabb482ee7e2 /.clang-format | |
| parent | 98a27f1fe4f0cb96ce7fdeee2e95079ae19db5cd (diff) | |
| download | hdf5-1bf8fa2665fd606d7c616eaa4223decfce2c25f2.zip hdf5-1bf8fa2665fd606d7c616eaa4223decfce2c25f2.tar.gz hdf5-1bf8fa2665fd606d7c616eaa4223decfce2c25f2.tar.bz2 | |
1 12 Whitespace changes after clang-format run (#288)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
* Whitespace after clang formatting
* Undo format version 11 changes
* Update check to working version
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index 5b7d76f..34b7563 100644 --- a/.clang-format +++ b/.clang-format @@ -1,9 +1,12 @@ --- Language: Cpp BasedOnStyle: LLVM -AlignConsecutiveMacros: true AlignConsecutiveAssignments: true +#llvm11: AlignConsecutiveBitFields: false AlignConsecutiveDeclarations: true +AlignConsecutiveMacros: true +#llvm10-11: AlignOperands: true - Align +#llvm11: AllowShortEnumsOnASingleLine: true AlwaysBreakAfterReturnType: AllDefinitions # Can enable the following section when llvm 12.x is out #AttributeMacros: @@ -20,8 +23,11 @@ AlwaysBreakAfterReturnType: AllDefinitions # - H5_ATTR_FALLTHROUGH BraceWrapping: AfterFunction: true + #llvm10-11: AfterControlStatement: false - Never BeforeCatch: true BeforeElse: true + #llvm11: BeforeLambdaBody: false + #llvm11: BeforeWhile: false BreakBeforeBraces: Stroustrup BreakAfterJavaFieldAnnotations: true BreakStringLiterals: true @@ -44,11 +50,15 @@ IncludeCategories: SortPriority: 0 IncludeIsMainRegex: '(public)?$' IndentCaseLabels: true +#llvm11: IndentCaseBlocks: false IndentGotoLabels: false +#llvm11: IndentExternBlock: AfterExternBlock IndentWidth: 4 +#llvm11: InsertTrailingCommas: None MacroBlockBegin: "^BEGIN_FUNC" MacroBlockEnd: "^END_FUNC" ObjCBlockIndentWidth: 4 +#llvm11: ObjCBreakBeforeNestedBlockParam: true ReflowComments: true SortIncludes: false StatementMacros: @@ -74,5 +84,11 @@ StatementMacros: - H5_GCC_DIAG_OFF - H5_GCC_DIAG_ON - CATCH +#llvm10: TypenameMacros: +#llvm10: - STACK_OF +#llvm10: - LIST +#llvm11: WhitespaceSensitiveMacros: +#llvm11: - STRINGIZE +#llvm11: - PP_STRINGIZE ... |