From ee752790cd2fcfff1a8df14c952ea23fadaa780f Mon Sep 17 00:00:00 2001 From: fanquake Date: Thu, 9 Jul 2020 19:00:17 +0800 Subject: [PATCH] Merge #19454: tools: `.clang-format` compat with clang versions < 9 b9253c7d2089d3d159dcc10118ce5a219d9a6881 tools: clang-format 6 compatibility (Jon Atack) Pull request description: Our `.clang-format` settings inadvertently lost compatibility with Clang versions < 9 in #19095, including for Debian stable. This patch returns compatibility in the interim until the distros update. See discussion from https://github.com/bitcoin/bitcoin/pull/19095#issuecomment-651926138. ACKs for top commit: MarcoFalke: Approach ACK b9253c7d2089d3d159dcc10118ce5a219d9a6881 , haven't tested Tree-SHA512: 4af541a195f48d84ffb80e23aaefb624c66bc78f087c8d92b4af5a654420b69fedf25272c6e4fde2688ff88412d306b7a990ce1e15d8b24180374c625a253fb6 --- src/.clang-format | 1 - 1 file changed, 1 deletion(-) diff --git a/src/.clang-format b/src/.clang-format index a8e8ce69fe..bedf672b61 100644 --- a/src/.clang-format +++ b/src/.clang-format @@ -3,7 +3,6 @@ AccessModifierOffset: -4 AlignAfterOpenBracket: true AlignEscapedNewlinesLeft: true AlignTrailingComments: true -AllowAllArgumentsOnNextLine : true AllowAllParametersOfDeclarationOnNextLine: true AllowShortBlocksOnASingleLine: false AllowShortFunctionsOnASingleLine: All