diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-30 15:42:24 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-30 15:42:36 +0100 |
| commit | 81d5af42f4dba5b68a597536cad7f61894dc22a3 (patch) | |
| tree | 6aef7296933ec0549e248848bf49e7a24eeaa5f8 /src/psbt.h | |
| parent | 817aeca57a4cc3c8b4b321dbc653bfc4a8d61b0c (diff) | |
| parent | 79bff8e48aca961ec271b0d592aca9278b981e2f (diff) | |
| download | bitcoin-81d5af42f4dba5b68a597536cad7f61894dc22a3.tar.xz | |
Merge #20499: Remove obsolete NODISCARD ifdef forest. Use [[nodiscard]] (C++17).
79bff8e48aca961ec271b0d592aca9278b981e2f Remove NODISCARD (practicalswift)
4848e711076c6ebc5d841feb83baeb6d2bc76c94 scripted-diff: Use [[nodiscard]] (C++17) instead of NODISCARD (practicalswift)
Pull request description:
Remove obsolete `NODISCARD` `ifdef` forest. Use `[[nodiscard]]` (C++17).
ACKs for top commit:
theStack:
ACK 79bff8e48aca961ec271b0d592aca9278b981e2f
fanquake:
ACK 79bff8e48aca961ec271b0d592aca9278b981e2f
Tree-SHA512: 56dbb8e50ed97ecfbce28cdc688a01146108acae49a943e338a8f983f7168914710d36e38632f6a7c200ba6c6ac35b2519e97d6c985e8e7eb23223f13bf985d6
Diffstat (limited to 'src/psbt.h')
| -rw-r--r-- | src/psbt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/psbt.h b/src/psbt.h index 0951b76f83..b566726ee3 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -398,7 +398,7 @@ struct PartiallySignedTransaction /** Merge psbt into this. The two psbts must have the same underlying CTransaction (i.e. the * same actual Bitcoin transaction.) Returns true if the merge succeeded, false otherwise. */ - NODISCARD bool Merge(const PartiallySignedTransaction& psbt); + [[nodiscard]] bool Merge(const PartiallySignedTransaction& psbt); bool AddInput(const CTxIn& txin, PSBTInput& psbtin); bool AddOutput(const CTxOut& txout, const PSBTOutput& psbtout); PartiallySignedTransaction() {} @@ -605,11 +605,11 @@ bool FinalizeAndExtractPSBT(PartiallySignedTransaction& psbtx, CMutableTransacti * @param[in] psbtxs the PSBTs to combine * @return error (OK if we successfully combined the transactions, other error if they were not compatible) */ -NODISCARD TransactionError CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs); +[[nodiscard]] TransactionError CombinePSBTs(PartiallySignedTransaction& out, const std::vector<PartiallySignedTransaction>& psbtxs); //! Decode a base64ed PSBT into a PartiallySignedTransaction -NODISCARD bool DecodeBase64PSBT(PartiallySignedTransaction& decoded_psbt, const std::string& base64_psbt, std::string& error); +[[nodiscard]] bool DecodeBase64PSBT(PartiallySignedTransaction& decoded_psbt, const std::string& base64_psbt, std::string& error); //! Decode a raw (binary blob) PSBT into a PartiallySignedTransaction -NODISCARD bool DecodeRawPSBT(PartiallySignedTransaction& decoded_psbt, const std::string& raw_psbt, std::string& error); +[[nodiscard]] bool DecodeRawPSBT(PartiallySignedTransaction& decoded_psbt, const std::string& raw_psbt, std::string& error); #endif // BITCOIN_PSBT_H |