Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix QT and Boost bugs #140

Merged
merged 2 commits into from
May 30, 2019
Merged

Fix QT and Boost bugs #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c3092c
Fix bug in walletframe.cpp that causes wallet to crash on QT 5.10
meyer9 May 15, 2019
75ecfc4
Specify using boost for distance to avoid ambiguous call with newer s…
meyer9 May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/accumulators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ std::list<uint256> listAccCheckpointsNoDB;
uint32_t ParseChecksum(uint256 nChecksum, CoinDenomination denomination)
{
//shift to the beginning bit of this denomination and trim any remaining bits by returning 32 bits only
int pos = distance(zerocoinDenomList.begin(), find(zerocoinDenomList.begin(), zerocoinDenomList.end(), denomination));
int pos = boost::distance(zerocoinDenomList.begin(), find(zerocoinDenomList.begin(), zerocoinDenomList.end(), denomination));
nChecksum = nChecksum >> (32*((zerocoinDenomList.size() - 1) - pos));
return nChecksum.Get32();
}
Expand Down Expand Up @@ -521,4 +521,4 @@ map<CoinDenomination, int> GetMintMaturityHeight()
mapRet.insert(make_pair(denom, mapDenomMaturity.at(denom).second));

return mapRet;
}
}
4 changes: 2 additions & 2 deletions src/qt/walletframe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2011-2013 The Bitcoin developers
// Copyright (c) 2011-2013 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.

Expand Down Expand Up @@ -41,7 +41,7 @@ bool WalletFrame::addWallet(const QString& name, WalletModel* walletModel)
if (!gui || !clientModel || !walletModel || mapWalletViews.count(name) > 0)
return false;

WalletView* walletView = new WalletView(this);
WalletView* walletView = new WalletView(walletStack);
walletView->setBitcoinGUI(gui);
walletView->setClientModel(clientModel);
walletView->setWalletModel(walletModel);
Expand Down