aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkatesh Srinivas <me@endeavour.zapto.org>2011-08-07 12:20:00 -0400
committerJeff Garzik <jgarzik@pobox.com>2011-08-10 22:40:10 -0400
commit7c3002bf272c56dcc92b463db6d0b793221bfa8a (patch)
treebf7e8a62a264d7a3eb8f2b9a6dd2820409350b54
parenteb20f3c8f5258076d195176ac589a869a9f24708 (diff)
Qualify make_tuple with boost:: namespace.
db.cpp has a number of uses of make_tuple and has 'using namespace std' and 'using namespace boost'. Without qualifying make_tuple, std::make_tuple is preferred, which is incorrect. This patch qualifies make_tuple. Signed-off-by: Jeff Garzik <jgarzik@exmulti.com>
-rw-r--r--src/db.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/db.cpp b/src/db.cpp
index 9c8c9c4f73..b3fa3e1731 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -610,7 +610,7 @@ bool CWalletDB::WriteAccount(const string& strAccount, const CAccount& account)
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)
@@ -638,7 +638,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list<CAccountin
// Read next record
CDataStream ssKey;
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;
int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags);
fFlags = DB_NEXT;