zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Visual C++ compatibility fixes

This commit is contained in:
Gavin Andresen 2011-02-10 19:24:22 -05:00
parent d2e2cb0d27
commit 47908a8907
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpc.cpp
View File

@ -1015,13 +1015,13 @@ Value listtransactions(const Array& params, bool fHelp)
for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{ {
CWalletTx* wtx = &((*it).second); 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; list<CAccountingEntry> acentries;
walletdb.ListAccountCreditDebit(strAccount, acentries); walletdb.ListAccountCreditDebit(strAccount, acentries);
foreach(CAccountingEntry& entry, 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: // Now: iterate backwards until we have nCount items to return:
@ -1762,7 +1762,7 @@ void ThreadRPCServer2(void* parg)
map<string, string> mapHeaders; map<string, string> mapHeaders;
string strRequest; 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)))) if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30))))
{ // Timed out: { // Timed out:
acceptor.cancel(); acceptor.cancel();

2
serialize.h
View File

@ -763,6 +763,8 @@ struct secure_allocator : public std::allocator<T>
typedef typename base::value_type value_type; typedef typename base::value_type value_type;
secure_allocator() throw() {} secure_allocator() throw() {}
secure_allocator(const secure_allocator& a) throw() : base(a) {} secure_allocator(const secure_allocator& a) throw() : base(a) {}
template <typename U>
secure_allocator(const secure_allocator<U>& a) throw() : base(a) {}
~secure_allocator() throw() {} ~secure_allocator() throw() {}
template<typename _Other> struct rebind template<typename _Other> struct rebind
{ typedef secure_allocator<_Other> other; }; { typedef secure_allocator<_Other> other; };