diff options
Diffstat (limited to 'third_party/aom/.clang-format')
| -rw-r--r-- | third_party/aom/.clang-format | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/aom/.clang-format b/third_party/aom/.clang-format index 7837b7704d..c1483199e0 100644 --- a/third_party/aom/.clang-format +++ b/third_party/aom/.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 @@ IncludeIsMainRegex: '([-_](test|unittest))?$' IndentCaseLabels: true IndentWidth: 2 IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true KeepEmptyLinesAtTheStartOfBlocks: false MacroBlockBegin: '' MacroBlockEnd: '' @@ -78,6 +80,7 @@ PointerAlignment: Right ReflowComments: true SortIncludes: false SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements SpaceInEmptyParentheses: false |