diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2016-10-20 10:18:02 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2016-10-20 10:18:05 +0000 |
| commit | 7942d31d5fa0c78136fc51d4746d6d61eeb587a7 (patch) | |
| tree | 7dc4be0f525346fccb7d9cfb0fae1b94ed6a2aa3 | |
| parent | f2d705629b510e2a5b25c8ecac1898fed13a16a2 (diff) | |
RPC: importmulti: Avoid using boost::variant::operator!=, which is only in newer boost versions
| -rw-r--r-- | src/wallet/rpcdump.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index 7b16b4adfb..b638810e9d 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -808,7 +808,7 @@ UniValue processImport(const UniValue& data) { CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID()); // Consistency check. - if (!isScript && pubKeyAddress.Get() != address.Get()) { + if (!isScript && !(pubKeyAddress.Get() == address.Get())) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed"); } @@ -819,7 +819,7 @@ UniValue processImport(const UniValue& data) { if (ExtractDestination(script, destination)) { scriptAddress = CBitcoinAddress(destination); - if (scriptAddress.Get() != pubKeyAddress.Get()) { + if (!(scriptAddress.Get() == pubKeyAddress.Get())) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed"); } } @@ -881,7 +881,7 @@ UniValue processImport(const UniValue& data) { CBitcoinAddress pubKeyAddress = CBitcoinAddress(pubKey.GetID()); // Consistency check. - if (!isScript && pubKeyAddress.Get() != address.Get()) { + if (!isScript && !(pubKeyAddress.Get() == address.Get())) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed"); } @@ -892,7 +892,7 @@ UniValue processImport(const UniValue& data) { if (ExtractDestination(script, destination)) { scriptAddress = CBitcoinAddress(destination); - if (scriptAddress.Get() != pubKeyAddress.Get()) { + if (!(scriptAddress.Get() == pubKeyAddress.Get())) { throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Consistency check failed"); } } |