From 7c9f7452f4fd775ff80dbdfc27a6bfa07a1e8fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 18 Jul 2018 16:24:33 +0200 Subject: Style: Format code with clang-format 6.0.1 --- .clang-format | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '.clang-format') diff --git a/.clang-format b/.clang-format index 212bc25109..3a2c39a174 100644 --- a/.clang-format +++ b/.clang-format @@ -1,6 +1,6 @@ # Commented out parameters are those with the same value as base LLVM style # We can uncomment them if we want to change their value, or enforce the -# chosen value in case the base style changes (last sync: Clang 5.0.0). +# chosen value in case the base style changes (last sync: Clang 6.0.1). --- ### General config, applies to all languages ### BasedOnStyle: LLVM @@ -32,6 +32,7 @@ AllowShortIfStatementsOnASingleLine: true # AfterObjCDeclaration: false # AfterStruct: false # AfterUnion: false +# AfterExternBlock: false # BeforeCatch: false # BeforeElse: false # IndentBraces: false @@ -60,6 +61,7 @@ Cpp11BracedListStyle: false # - foreach # - Q_FOREACH # - BOOST_FOREACH +# IncludeBlocks: Preserve IncludeCategories: - Regex: '".*"' Priority: 1 @@ -69,6 +71,7 @@ IncludeCategories: Priority: 3 # IncludeIsMainRegex: '(Test)?$' IndentCaseLabels: true +# IndentPPDirectives: None IndentWidth: 4 # IndentWrappedFunctionNames: false # JavaScriptQuotes: Leave @@ -86,6 +89,10 @@ IndentWidth: 4 # PenaltyExcessCharacter: 1000000 # PenaltyReturnTypeOnItsOwnLine: 60 # PointerAlignment: Right +# RawStringFormats: +# - Delimiter: pb +# Language: TextProto +# BasedOnStyle: google # ReflowComments: true # SortIncludes: true # SortUsingDeclarations: true -- cgit v1.2.3