X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=.clang-format;fp=.clang-format;h=300e046c5f7a8ead68809eb8b4bb45cb89a69525;hb=ff7ea753d4069f125953d690df066c5b8c83e4c2;hp=51f4ffa27062d7f8d5e9ba6289648116978e2acc;hpb=2bf8d3246aba9009042c293bb0154c7738e47ae3;p=babeltrace.git

diff --git a/.clang-format b/.clang-format
index 51f4ffa2..300e046c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,17 +1,19 @@
-# for clang-format ≥ 10
+# For clang-format 13
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveMacros: true
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: Consecutive
 AlignEscapedNewlines: Right
-AlignOperands: true
+AlignOperands: Align
 AlignTrailingComments: true
 AllowAllArgumentsOnNextLine: false
 AllowAllConstructorInitializersOnNextLine: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: None
@@ -19,10 +21,22 @@ AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros: [
+  '_BT_LOG_PRINTFLIKE',
+  'ARGPAR_HIDDEN',
+  'BT_ASSERT_COND_DEV_FUNC',
+  'BT_ASSERT_DBG_FUNC',
+  'BT_CTF_ASSERT_PRE_FUNC',
+  'BT_EXTERN_C',
+  'BT_HIDDEN',
+  'SWIGEXPORT',
+  'SWIGUNUSED',
+  'YY_ATTRIBUTE_PURE',
+  'YY_ATTRIBUTE_UNUSED',
+  'yynoreturn',
+]
 BinPackArguments: true
 BinPackParameters: true
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Custom
 BraceWrapping:
   AfterCaseLabel: true
   AfterClass: true
@@ -40,6 +54,8 @@ BraceWrapping:
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
@@ -50,38 +66,61 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
+DeriveLineEnding: false
 DerivePointerAlignment: false
 DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
+EmptyLineBeforeAccessModifier: Always
 FixNamespaceComments: true
+ForEachMacros: [
+  'bt_list_for_each',
+  'bt_list_for_each_entry',
+  'bt_list_for_each_entry_reverse',
+  'bt_list_for_each_entry_safe',
+  'bt_list_for_each_prev',
+  'bt_list_for_each_prev_safe',
+]
 IncludeBlocks: Preserve
+IndentAccessModifiers: false
+IndentCaseBlocks: false
 IndentCaseLabels: false
+IndentExternBlock: NoIndent
+IndentGotoLabels: false
 IndentPPDirectives: AfterHash
 IndentWidth: 4
 IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
 KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
 Language: Cpp
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
-PointerAlignment: Left
+PPIndentWidth: 4
+PointerAlignment: Right
+ReferenceAlignment: Left
 ReflowComments: false
 SortIncludes: false
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Both
 SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
 SpaceBeforeCpp11BracedList: true
 SpaceBeforeCtorInitializerColon: true
 SpaceBeforeInheritanceColon: true
 SpaceBeforeParens: ControlStatements
 SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles: false
-SpacesInCStyleCastParentheses: false
+SpacesInAngles: Never
+SpacesInConditionalStatement: false
 SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Cpp11
+UseCRLF: false
 UseTab: Never