Skip to content

Commit 2f9e6e2

Browse files
committed
Fix .clang-format for newer versions.
1 parent d231a88 commit 2f9e6e2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

.clang-format

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
AccessModifierOffset: -4
3-
AlignEscapedNewlinesLeft: true
3+
AlignEscapedNewlines: Left
44
AlignTrailingComments: true
55
AllowAllParametersOfDeclarationOnNextLine: true
66
# Requires Clang-Format 10+
7-
# AllowShortBlocksOnASingleLine: 'Empty'
8-
AllowShortFunctionsOnASingleLine: false
9-
AllowShortIfStatementsOnASingleLine: true
7+
# AllowShortBlocksOnASingleLine: Empty
8+
AllowShortFunctionsOnASingleLine: None
9+
AllowShortIfStatementsOnASingleLine: Always
1010
AllowShortLoopsOnASingleLine: false
1111
AlwaysBreakBeforeMultilineStrings: false
12-
AlwaysBreakTemplateDeclarations: true
12+
AlwaysBreakTemplateDeclarations: Yes
1313
BinPackParameters: true
14-
BreakBeforeBinaryOperators: false
14+
BreakBeforeBinaryOperators: None
1515
BreakBeforeBraces: Attach
1616
BreakBeforeTernaryOperators: false
1717
BreakConstructorInitializersBeforeComma: false
@@ -20,10 +20,10 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
2020
ConstructorInitializerIndentWidth: 4
2121
ContinuationIndentWidth: 4
2222
Cpp11BracedListStyle: true
23-
DerivePointerBinding: false
23+
DerivePointerAlignment: false
2424
ExperimentalAutoDetectBinPacking: false
2525
IndentCaseLabels: false
26-
IndentFunctionDeclarationAfterType: false
26+
IndentWrappedFunctionNames: false
2727
IndentWidth: 4
2828
MaxEmptyLinesToKeep: 1
2929
NamespaceIndentation: None
@@ -34,8 +34,8 @@ PenaltyBreakFirstLessLess: 120
3434
PenaltyBreakString: 1000
3535
PenaltyExcessCharacter: 1000000
3636
PenaltyReturnTypeOnItsOwnLine: 60
37-
PointerBindsToType: false
38-
SpaceAfterControlStatementKeyword: true
37+
PointerAlignment: Right
38+
SpaceBeforeParens: ControlStatements
3939
SpaceAfterCStyleCast: false
4040
SpaceAfterTemplateKeyword: false
4141
SpaceBeforeAssignmentOperators: true

0 commit comments

Comments
 (0)