doc: Fix doxygen comment silent merge conflict in descriptor.cpp #21736

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2021-04-parameter-documentation changing 1 files +1 −1

laanwj commented at 7:30 AM on April 20, 2021: member

It looks like #21238 introduced a silent merge conflict in the documentation, which fails with -Wdocumentation in the CI.

(please merge only if CI passes)

doc: Fix doxygen comment silent merge conflict in descriptor.cpp

It looks like #21238 introduced a silent merge conflict in the
documentation, which fails with `-Wdocumentation` in the CI.

e5faec65bd

laanwj added the label Docs on Apr 20, 2021
MarcoFalke commented at 7:35 AM on April 20, 2021: member

ACK if green
Sjors commented at 8:05 AM on April 20, 2021: member

ACK if green
ajtowns commented at 8:18 AM on April 20, 2021: member

ACK e5faec65bd06a3b14175aca3040290f343bd6e9c -- fixed it for me
meshcollider commented at 8:38 AM on April 20, 2021: contributor

ACK e5faec65bd06a3b14175aca3040290f343bd6e9c modulo CI
MarcoFalke commented at 8:39 AM on April 20, 2021: member
Only looked at the nowallet task:
- master red: https://github.com/bitcoin/bitcoin/runs/2388106251
This pull: Green :rocket:
MarcoFalke merged this on Apr 20, 2021
MarcoFalke closed this on Apr 20, 2021
hebasto commented at 9:40 AM on April 20, 2021: member

FWIW, -Wdocumentation is activated only when --enable-suppress-external-warnings.

That is the reason why I'm suggesting to --enable-suppress-external-warnings by default.
sidhujag referenced this in commit 96fceb1a1c on Apr 20, 2021
sidhujag referenced this in commit 19687e30ee on Apr 20, 2021
gwillen referenced this in commit d6417d70e8 on Jun 1, 2022
DrahtBot locked this on Aug 16, 2022

Contributors

Labels