summaryrefslogtreecommitdiffstats
path: root/.clang-format
diff options
context:
space:
mode:
authormrsmidge <smidge@xsco.net>2019-08-15 23:14:03 +0100
committermrsmidge <smidge@xsco.net>2019-08-15 23:14:03 +0100
commitc5323b155eb9c2815087580d635765a9aea89fca (patch)
tree24b61b0c654fe402bf083b2270475006e31c4a51 /.clang-format
parent6c30925688bbe8b448304c3a819b1c62da6edf9d (diff)
clang-format cleanup
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format13
1 files changed, 7 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format
index de0dd55..a90ead2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,5 @@
---
+# Compatible with clang-format 6.0.0
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -4
@@ -41,17 +42,17 @@ BreakBeforeBraces: Allman
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
+BreakConstructorInitializers: AfterColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
@@ -93,7 +94,7 @@ PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left
RawStringFormats:
- - Delimiters: [ 'pb' ]
+ - Delimiter: 'pb'
Language: TextProto
BasedOnStyle: google
ReflowComments: true
@@ -110,8 +111,8 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
-Standard: Cpp11
-TabWidth: 8
+Standard: Cpp03
+TabWidth: 4
UseTab: Never
...