From: CryptoManiac <CryptoManiac@users.noreply.github.com>
Date: Fri, 8 May 2015 16:52:55 +0000 (+0300)
Subject: Merge pull request #219 from svost/boost
X-Git-Tag: nvc-v0.5.3~12
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=a10c50739f9072e8cf04865546a4fa83a77e7d2f;hp=-c

Merge pull request #219 from svost/boost

Fix boost::get usage with boost 1.58 (bitcoin issue #6056)
---

a10c50739f9072e8cf04865546a4fa83a77e7d2f
diff --combined src/rpcrawtransaction.cpp
index ee9faf5,6a810fa..32a339b
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@@ -48,8 -48,8 +48,8 @@@ void TxToJSON(const CTransaction& tx, c
  {
      entry.push_back(Pair("txid", tx.GetHash().GetHex()));
      entry.push_back(Pair("version", tx.nVersion));
 -    entry.push_back(Pair("time", (boost::int64_t)tx.nTime));
 -    entry.push_back(Pair("locktime", (boost::int64_t)tx.nLockTime));
 +    entry.push_back(Pair("time", (int64_t)tx.nTime));
 +    entry.push_back(Pair("locktime", (int64_t)tx.nLockTime));
      Array vin;
      BOOST_FOREACH(const CTxIn& txin, tx.vin)
      {
@@@ -59,13 -59,13 +59,13 @@@
          else
          {
              in.push_back(Pair("txid", txin.prevout.hash.GetHex()));
 -            in.push_back(Pair("vout", (boost::int64_t)txin.prevout.n));
 +            in.push_back(Pair("vout", (int64_t)txin.prevout.n));
              Object o;
              o.push_back(Pair("asm", txin.scriptSig.ToString()));
              o.push_back(Pair("hex", HexStr(txin.scriptSig.begin(), txin.scriptSig.end())));
              in.push_back(Pair("scriptSig", o));
          }
 -        in.push_back(Pair("sequence", (boost::int64_t)txin.nSequence));
 +        in.push_back(Pair("sequence", (int64_t)txin.nSequence));
          vin.push_back(in);
      }
      entry.push_back(Pair("vin", vin));
@@@ -75,7 -75,7 +75,7 @@@
          const CTxOut& txout = tx.vout[i];
          Object out;
          out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
 -        out.push_back(Pair("n", (boost::int64_t)i));
 +        out.push_back(Pair("n", (int64_t)i));
          Object o;
          ScriptPubKeyToJSON(txout.scriptPubKey, o, true);
          out.push_back(Pair("scriptPubKey", o));
@@@ -93,8 -93,8 +93,8 @@@
              if (pindex->IsInMainChain())
              {
                  entry.push_back(Pair("confirmations", 1 + nBestHeight - pindex->nHeight));
 -                entry.push_back(Pair("time", (boost::int64_t)pindex->nTime));
 -                entry.push_back(Pair("blocktime", (boost::int64_t)pindex->nTime));
 +                entry.push_back(Pair("time", (int64_t)pindex->nTime));
 +                entry.push_back(Pair("blocktime", (int64_t)pindex->nTime));
              }
              else
                  entry.push_back(Pair("confirmations", 0));
@@@ -209,7 -209,7 +209,7 @@@ Value listunspent(const Array& params, 
              CTxDestination address;
              if (ExtractDestination(pk, address))
              {
-                 const CScriptID& hash = boost::get<const CScriptID&>(address);
+                 const CScriptID& hash = boost::get<CScriptID>(address);
                  CScript redeemScript;
                  if (pwalletMain->GetCScript(hash, redeemScript))
                      entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));