diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2019-06-22 17:16:56 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2019-06-22 17:18:01 +0900 |
| commit | 7f6578aa7d9b2618aed13917c5681b93683a37a7 (patch) | |
| tree | 2b162a5d6c5319703b0945404695d8462bcc41b3 | |
| parent | 0abde365832134114e7f8ba6695c8280e83cdca3 (diff) | |
clang-format-8
| -rw-r--r-- | .clang-format | 18 | ||||
| -rw-r--r-- | src/libssl_compat.h | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index cb2bd10c..7cd30134 100644 --- a/.clang-format +++ b/.clang-format @@ -16,10 +16,10 @@ AllowShortLoopsOnASingleLine: false AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterReturnType: None AlwaysBreakBeforeMultilineStrings: false -AlwaysBreakTemplateDeclarations: false +AlwaysBreakTemplateDeclarations: MultiLine BinPackArguments: true BinPackParameters: true -BraceWrapping: +BraceWrapping: AfterClass: false AfterControlStatement: false AfterEnum: false @@ -38,6 +38,7 @@ BraceWrapping: BreakBeforeBinaryOperators: None BreakBeforeBraces: Stroustrup BreakBeforeInheritanceComma: false +BreakInheritanceList: BeforeColon BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon @@ -54,12 +55,12 @@ DerivePointerAlignment: false DisableFormat: false ExperimentalAutoDetectBinPacking: false FixNamespaceComments: true -ForEachMacros: +ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH IncludeBlocks: Preserve -IncludeCategories: +IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 2 - Regex: '^(<|"(gtest|isl|json)/)' @@ -78,6 +79,7 @@ MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: None +ObjCBinPackProtocolList: Auto ObjCBlockIndentWidth: 2 ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true @@ -86,6 +88,7 @@ PenaltyBreakBeforeFirstCallParameter: 19 PenaltyBreakComment: 300 PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Left @@ -95,7 +98,11 @@ SortUsingDeclarations: true SpaceAfterCStyleCast: false SpaceAfterTemplateKeyword: true SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyParentheses: false SpacesBeforeTrailingComments: 1 SpacesInAngles: false @@ -104,6 +111,9 @@ SpacesInCStyleCastParentheses: false SpacesInParentheses: false SpacesInSquareBrackets: false Standard: Cpp11 +StatementMacros: + - Q_UNUSED + - QT_REQUIRE_VERSION TabWidth: 8 UseTab: Never ... diff --git a/src/libssl_compat.h b/src/libssl_compat.h index 3c3e0119..2199bbb9 100644 --- a/src/libssl_compat.h +++ b/src/libssl_compat.h @@ -44,7 +44,7 @@ #endif // !defined(LIBRESSL_VERSION_NUMBER) #define OPENSSL_101_API \ - ((!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \ - (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER >= 0x20700000L)) + ((!LIBRESSL_IN_USE && OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \ + (LIBRESSL_IN_USE && LIBRESSL_VERSION_NUMBER >= 0x20700000L)) #endif // LIBSSL_COMPAT_H |