summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-11-13 18:14:44 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-11-15 18:09:30 +0100
commita808c18b736762384e835746d19c7dae97d38990 (patch)
treedd4334503028b70c15016d1f49046151905ce349 /.clang-format
parent4e30a57e6bae7296972865e836913ba7e5e3cdf6 (diff)
downloadmariadb-git-a808c18b736762384e835746d19c7dae97d38990.tar.gz
Make .clang-format work with clang-8
Remove keywords that are too new.
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format6
1 files changed, 0 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format
index 1ad93ead80a..7ad3d0dbddc 100644
--- a/.clang-format
+++ b/.clang-format
@@ -7,14 +7,10 @@ AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
AlignOperands: true
AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
-AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
@@ -23,7 +19,6 @@ AlwaysBreakTemplateDeclarations: MultiLine
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
- AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
@@ -93,7 +88,6 @@ ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
-SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: false
SpaceBeforeCpp11BracedList: false