Merge pull request #6076

8b08d95 wallet: fix boost::get usage with boost 1.58 (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan committed 2015-04-29 09:03:58 +02:00
commit 6c97fd1054
1 file changed
+1 -1
+1 -1
View File
@@ -2330,7 +2330,7 @@ Value listunspent(const Array& params, bool fHelp)
if (pk.IsPayToScriptHash()) { if (pk.IsPayToScriptHash()) {
CTxDestination address; CTxDestination address;
if (ExtractDestination(pk, address)) { if (ExtractDestination(pk, address)) {
const CScriptID& hash = boost::get<const CScriptID&>(address); const CScriptID& hash = boost::get<CScriptID>(address);
CScript redeemScript; CScript redeemScript;
if (pwalletMain->GetCScript(hash, redeemScript)) if (pwalletMain->GetCScript(hash, redeemScript))
entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end()))); entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));