highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-12 06:58:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Keep default argument value in correct type

Browse Source
This commit is contained in:
João Barbosa
2021-04-14 15:01:00 +01:00
parent a12962ca89
commit f81ef4303e
10 changed files with 187 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/rpc/util.cpp
View File

@@ -646,7 +646,7 @@ std::string RPCArg::GetName() const
bool RPCArg::IsOptional() const
{
if (m_fallback.index() == 1) {
if (m_fallback.index() != 0) {
return true;
} else {
return RPCArg::Optional::NO != std::get<RPCArg::Optional>(m_fallback);
@@ -694,7 +694,9 @@ std::string RPCArg::ToDescriptionString() const
} // no default case, so the compiler can warn about missing cases
}
if (m_fallback.index() == 1) {
ret += ", optional, default=" + std::get<std::string>(m_fallback);
ret += ", optional, default=" + std::get<RPCArg::DefaultHint>(m_fallback);
} else if (m_fallback.index() == 2) {
ret += ", optional, default=" + std::get<RPCArg::Default>(m_fallback).write();
} else {
switch (std::get<RPCArg::Optional>(m_fallback)) {
case RPCArg::Optional::OMITTED: {