diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-02-10 19:24:22 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-02-10 19:24:22 -0500 |
commit | 47908a890726f424371c9784b8508cff163c2c78 (patch) | |
tree | a6cad544ed82f11837bd88ae5d1a68f0d3e57974 /rpc.cpp | |
parent | d2e2cb0d27deb3098153b43d26743030f24ac1c8 (diff) |
Visual C++ compatibility fixes
Diffstat (limited to 'rpc.cpp')
-rw-r--r-- | rpc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1015,13 +1015,13 @@ Value listtransactions(const Array& params, bool fHelp) for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { CWalletTx* wtx = &((*it).second); - txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, 0))); + txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, (CAccountingEntry*)0))); } list<CAccountingEntry> acentries; walletdb.ListAccountCreditDebit(strAccount, acentries); foreach(CAccountingEntry& entry, acentries) { - txByTime.insert(make_pair(entry.nTime, TxPair(0, &entry))); + txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry))); } // Now: iterate backwards until we have nCount items to return: @@ -1762,7 +1762,7 @@ void ThreadRPCServer2(void* parg) map<string, string> mapHeaders; string strRequest; - boost::thread api_caller(ReadHTTP, ref(stream), ref(mapHeaders), ref(strRequest)); + boost::thread api_caller(ReadHTTP, boost::ref(stream), boost::ref(mapHeaders), boost::ref(strRequest)); if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30)))) { // Timed out: acceptor.cancel(); |