Browse Source

Merge pull request #460 from jgarzik/make-tuple

Qualify make_tuple with boost:: namespace.
0.8
Gavin Andresen 13 years ago
parent
commit
72173ffaca
  1. 4
      src/db.cpp

4
src/db.cpp

@ -610,7 +610,7 @@ bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account)
bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry)
{ {
return Write(make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry); return Write(boost::make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry);
} }
int64 CWalletDB::GetAccountCreditDebit(const string& strAccount) int64 CWalletDB::GetAccountCreditDebit(const string& strAccount)
@ -638,7 +638,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
// Read next record // Read next record
CDataStream ssKey; CDataStream ssKey;
if (fFlags == DB_SET_RANGE) if (fFlags == DB_SET_RANGE)
ssKey << make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64(0)); ssKey << boost::make_tuple(string("acentry"), (fAllAccounts? string("") : strAccount), uint64(0));
CDataStream ssValue; CDataStream ssValue;
int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags); int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags);
fFlags = DB_NEXT; fFlags = DB_NEXT;

Loading…
Cancel
Save