Skip to content

Commit

Permalink
Merge bitcoin#19454: tools: .clang-format compat with clang version…
Browse files Browse the repository at this point in the history
…s < 9

b9253c7 tools: clang-format 6 compatibility (Jon Atack)

Pull request description:

  Our `.clang-format` settings inadvertently lost compatibility with Clang versions < 9 in bitcoin#19095, including for Debian stable. This patch returns compatibility in the interim until the distros update. See discussion from bitcoin#19095 (comment).

ACKs for top commit:
  MarcoFalke:
    Approach ACK b9253c7 , haven't tested

Tree-SHA512: 4af541a195f48d84ffb80e23aaefb624c66bc78f087c8d92b4af5a654420b69fedf25272c6e4fde2688ff88412d306b7a990ce1e15d8b24180374c625a253fb6
  • Loading branch information
fanquake authored and PastaPastaPasta committed Jun 28, 2021
1 parent 7f46c0d commit bccbdaa
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/.clang-format
Expand Up @@ -3,7 +3,6 @@ AccessModifierOffset: -4
AlignAfterOpenBracket: true
AlignEscapedNewlinesLeft: true
AlignTrailingComments: true
AllowAllArgumentsOnNextLine : true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
Expand Down

0 comments on commit bccbdaa

Please sign in to comment.