draft 4

[chorizo.git] / .clang-format

diff --git a/.clang-format b/.clang-format
index 29b06b02ce7fb7d55734e4ed14a6afd077cc30fa..c33ab1db23c924525437b482894c089127eb41d3 100644 (file)
--- a/.clang-format
+++ b/.clang-format
@@ -7,11 +7,11 @@ AlignEscapedNewlines: Left # Unknown to clang-format-4.0
 AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: true
+AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: true
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
@@ -77,8 +77,8 @@ PenaltyReturnTypeOnItsOwnLine: 60
 
 PointerAlignment: Right
 ReflowComments: false
-SortIncludes: false
-SortUsingDeclarations: false # Unknown to clang-format-4.0
+SortIncludes: true
+SortUsingDeclarations: true # Unknown to clang-format-4.0
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true