diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 14:02:22 -0600 |
| commit | eb6c8c937e214f58cc4da48bd4db455315de4c20 (patch) | |
| tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /.clang-format | |
| parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge branch 'master' 6.4.10 into DRTVWR-510
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 61c5acde88..ee8a8a8c92 100644 --- a/.clang-format +++ b/.clang-format @@ -12,7 +12,7 @@ AlignOperands: true AlignTrailingComments: true AllowAllArgumentsOnNextLine: false AllowAllConstructorInitializersOnNextLine: false -AllowAllParametersOfDeclarationOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: false AllowShortBlocksOnASingleLine: Always AllowShortCaseLabelsOnASingleLine: false AllowShortFunctionsOnASingleLine: All @@ -23,8 +23,8 @@ AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: MultiLine -BinPackArguments: false -BinPackParameters: false +BinPackArguments: true +BinPackParameters: true BreakBeforeBinaryOperators: None BreakBeforeBraces: Allman BreakBeforeInheritanceComma: false @@ -44,7 +44,7 @@ Cpp11BracedListStyle: true DeriveLineEnding: true DerivePointerAlignment: false DisableFormat: false -ExperimentalAutoDetectBinPacking: false +ExperimentalAutoDetectBinPacking: true FixNamespaceComments: true ForEachMacros: - foreach |