diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-07-20 17:59:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-07-20 18:00:32 +0200 |
| commit | 6d6b11e793a2d1a106238a2838f5df1d3124217b (patch) | |
| tree | 93be97bf9de5ef09879ba7824a17e525ed0de606 /src/qt/paymentserver.cpp | |
| parent | Merge pull request #6453 (diff) | |
| parent | [Qt] remove std namespace polution from code (diff) | |
| download | discoin-6d6b11e793a2d1a106238a2838f5df1d3124217b.tar.xz discoin-6d6b11e793a2d1a106238a2838f5df1d3124217b.zip | |
Merge pull request #6408
dca6040 [Qt] remove std namespace polution from code (Philip Kaufmann)
Diffstat (limited to 'src/qt/paymentserver.cpp')
| -rw-r--r-- | src/qt/paymentserver.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 654292903..6481b0046 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -46,8 +46,6 @@ #include <QUrlQuery> #endif -using namespace std; - const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds const QString BITCOIN_IPC_PREFIX("bitcoin:"); // BIP70 payment protocol messages @@ -647,7 +645,7 @@ void PaymentServer::fetchPaymentACK(CWallet* wallet, SendCoinsRecipient recipien // Create a new refund address, or re-use: QString account = tr("Refund from %1").arg(recipient.authenticatedMerchant); std::string strAccount = account.toStdString(); - set<CTxDestination> refundAddresses = wallet->GetAccountAddresses(strAccount); + std::set<CTxDestination> refundAddresses = wallet->GetAccountAddresses(strAccount); if (!refundAddresses.empty()) { CScript s = GetScriptForDestination(*refundAddresses.begin()); payments::Output* refund_to = payment.add_refund_to(); |