mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-23 07:15:29 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6076

Browse source 
8b08d95 wallet: fix boost::get usage with boost 1.58 (Cory Fields)
This commit is contained in:
Wladimir J. van der Laan 2015-04-29 08:57:50 +02:00
commit 6c97fd1054
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/rpcwallet.cpp
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())));