update clang-format

2014-04-10 14:29:24 -04:00
parent 06bcab9560
commit ca5de70b2b
1 changed files with 1 additions and 4 deletions
--- 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