diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-01-18 14:36:47 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-01-18 14:36:47 -0800 |
| commit | ecd49345b5c500b9ea1da70b15c90b87da3ff55a (patch) | |
| tree | 29afa5d2986d5c85a93e126c1d1f1cd1213d82ab /.clang-format | |
| parent | cf1d6eb4ae1b48958454259f7e26bee9140cbf65 (diff) | |
Use clang-format-3.5
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/.clang-format b/.clang-format index 38804f78c4..651e1296ba 100644 --- a/.clang-format +++ b/.clang-format @@ -2,27 +2,22 @@ Language: Cpp # BasedOnStyle: Google AccessModifierOffset: -1 -AlignAfterOpenBracket: true +ConstructorInitializerIndentWidth: 4 AlignEscapedNewlinesLeft: true -AlignOperands: true AlignTrailingComments: true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false -AllowShortCaseLabelsOnASingleLine: false AllowShortIfStatementsOnASingleLine: true AllowShortLoopsOnASingleLine: true AllowShortFunctionsOnASingleLine: All -AlwaysBreakAfterDefinitionReturnType: false AlwaysBreakTemplateDeclarations: true AlwaysBreakBeforeMultilineStrings: true -BreakBeforeBinaryOperators: None +BreakBeforeBinaryOperators: false BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false BinPackParameters: true -BinPackArguments: true ColumnLimit: 80 ConstructorInitializerAllOnOneLineOrOnePerLine: true -ConstructorInitializerIndentWidth: 4 DerivePointerAlignment: true ExperimentalAutoDetectBinPacking: false IndentCaseLabels: true @@ -31,7 +26,6 @@ IndentFunctionDeclarationAfterType: false MaxEmptyLinesToKeep: 1 KeepEmptyLinesAtTheStartOfBlocks: false NamespaceIndentation: None -ObjCBlockIndentWidth: 2 ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: false PenaltyBreakBeforeFirstCallParameter: 1 @@ -49,11 +43,9 @@ TabWidth: 8 UseTab: Never BreakBeforeBraces: Attach SpacesInParentheses: false -SpacesInSquareBrackets: false SpacesInAngles: false SpaceInEmptyParentheses: false SpacesInCStyleCastParentheses: false -SpaceAfterCStyleCast: false SpacesInContainerLiterals: true SpaceBeforeAssignmentOperators: true ContinuationIndentWidth: 4 |