diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-06-28 16:24:27 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-06-28 16:29:26 +0300 |
| commit | 4c69a855a181652d05826cffeb7f201f4e8186ff (patch) | |
| tree | 481d225fe656f673b488b2bfd5ada9f1acd34c65 /.clang-format | |
| parent | 3b0e0aaed43389c66bf3eebed035353b94da2dc7 (diff) | |
| parent | 6cfb9bec363f6d485bcf8b5b73747df8c793e320 (diff) | |
Merge branch 'master' into tm_builtin_pad
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format index 9a2c3ce1d..1cfcefeb2 100644 --- a/.clang-format +++ b/.clang-format @@ -18,7 +18,7 @@ AllowShortLoopsOnASingleLine: true AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: Yes +AlwaysBreakTemplateDeclarations: false BinPackArguments: false BinPackParameters: false BraceWrapping: @@ -37,18 +37,18 @@ BraceWrapping: SplitEmptyFunction: false SplitEmptyRecord: false SplitEmptyNamespace: false -BreakBeforeBinaryOperators: All +BreakBeforeBinaryOperators: None BreakBeforeBraces: Custom BreakBeforeInheritanceComma: false BreakInheritanceList: BeforeColon -BreakBeforeTernaryOperators: true +BreakBeforeTernaryOperators: false BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeComma BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true ColumnLimit: 78 CommentPragmas: '^ IWYU pragma:' -CompactNamespaces: false +CompactNamespaces: true ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 |