diff options
| author | fanquake <fanquake@gmail.com> | 2020-07-09 19:00:17 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-07-09 19:59:15 +0800 |
| commit | 6b48c30541e42152fa336d2346b4fae1c7969f14 (patch) | |
| tree | fdc2b707b40d0306a1a2d0b8f7f3c1d508fc5bc7 /src | |
| parent | c4a44186d816716f5918fd23464a51033f208b71 (diff) | |
| parent | b9253c7d2089d3d159dcc10118ce5a219d9a6881 (diff) | |
| download | bitcoin-6b48c30541e42152fa336d2346b4fae1c7969f14.tar.xz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/.clang-format | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/.clang-format b/src/.clang-format index a8f8565f80..ef7a0ef5c7 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 AllowShortCaseLabelsOnASingleLine: true |