RPC: importmulti: Avoid using boost::variant::operator!=, which is on…

…ly in newer boost versions
bitcoin · Oct 20, 2016 · 7942d31 · 7942d31
1 parent f2d7056
commit 7942d31
Showing 1 changed file with 4 additions and 4 deletions.
diff --git 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");
                         }
                     }