summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format5
1 files changed, 1 insertions, 4 deletions
diff --git a/.clang-format b/.clang-format
index 3557822cbd..0565d7379e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,6 @@ IndentWidth: 4
AccessModifierOffset: -4
UseTab: Never
BinPackParameters: true
-AllowShortFunctionsOnASingleLine: false
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
@@ -12,8 +11,6 @@ NamespaceIndentation: None
PointerBindsToType: false
SpacesInParentheses: false
BreakBeforeBraces: Attach
-ColumnLimit: 80
+ColumnLimit: 100
Cpp11BracedListStyle: true
-SpaceBeforeParens: ControlStatements
SpacesBeforeTrailingComments: 1
-SpacesInContainerLiterals: true