.clang-format: update to 4.0.1 based on Google style with the following differences: 3a4 > # Generated with clang-format 4.0.1 13c14 < AllowShortCaseLabelsOnASingleLine: false --- > AllowShortCaseLabelsOnASingleLine: true 23c24 < BraceWrapping: --- > BraceWrapping: 43c44 < ConstructorInitializerAllOnOneLineOrOnePerLine: true --- > ConstructorInitializerAllOnOneLineOrOnePerLine: false 46,47c47,48 < Cpp11BracedListStyle: true < DerivePointerAlignment: true --- > Cpp11BracedListStyle: false > DerivePointerAlignment: false 51c52 < IncludeCategories: --- > IncludeCategories: 78c79 < PointerAlignment: Left --- > PointerAlignment: Right 80c81 < SortIncludes: true --- > SortIncludes: false Change-Id: I0a73f0f984a7730e6448c1fadc4cf0b9440b9226
diff --git a/.clang-format b/.clang-format index 7837b77..c148319 100644 --- a/.clang-format +++ b/.clang-format
@@ -1,7 +1,7 @@ --- Language: Cpp # BasedOnStyle: Google -# Generated with clang-format 3.9.1 +# Generated with clang-format 4.0.1 AccessModifierOffset: -1 AlignAfterOpenBracket: Align AlignConsecutiveAssignments: false @@ -60,6 +60,8 @@ IndentCaseLabels: true IndentWidth: 2 IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: false MacroBlockBegin: '' MacroBlockEnd: '' @@ -78,6 +80,7 @@ ReflowComments: true SortIncludes: false SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements SpaceInEmptyParentheses: false