diff options
| author | James Zern <jzern@google.com> | 2017-01-31 20:07:09 -0800 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2017-02-15 22:24:03 -0800 |
| commit | c107183d0aec4622757abd808063bcbb8ea2642f (patch) | |
| tree | 18b48165c98d1ae2f442a35e24984673812467ad /.clang-format | |
| parent | 1b672d3ff714339591d611171d0b6217016550c6 (diff) | |
.clang-format: update to 3.9.1
Change-Id: Ia3b00907f98330ecaf28832b2c0a68e42cf93d6e
Diffstat (limited to '.clang-format')
| -rw-r--r-- | .clang-format | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format index d91cf89aa..7837b7704 100644 --- a/.clang-format +++ b/.clang-format @@ -1,7 +1,7 @@ --- Language: Cpp # BasedOnStyle: Google -# Generated with clang-format 3.8.1 +# Generated with clang-format 3.9.1 AccessModifierOffset: -1 AlignAfterOpenBracket: Align AlignConsecutiveAssignments: false @@ -37,6 +37,8 @@ BreakBeforeBinaryOperators: None BreakBeforeBraces: Attach BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' ConstructorInitializerAllOnOneLineOrOnePerLine: false @@ -54,6 +56,7 @@ IncludeCategories: Priority: 2 - Regex: '.*' Priority: 3 +IncludeIsMainRegex: '([-_](test|unittest))?$' IndentCaseLabels: true IndentWidth: 2 IndentWrappedFunctionNames: false |