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/script/descriptor.cpp | |
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/script/descriptor.cpp')
-rw-r--r-- | src/script/descriptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 6c0a98cca2..8d8fa185ba 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -731,7 +731,7 @@ enum class ParseScriptContext { }; /** Parse a key path, being passed a split list of elements (the first element is ignored). */ -NODISCARD bool ParseKeyPath(const std::vector<Span<const char>>& split, KeyPath& out, std::string& error) +[[nodiscard]] bool ParseKeyPath(const std::vector<Span<const char>>& split, KeyPath& out, std::string& error) { for (size_t i = 1; i < split.size(); ++i) { Span<const char> elem = split[i]; |