From bde280b9a4da2652716c8ffdeed9ebfa4461cc70 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Wed, 21 Dec 2011 22:33:19 +0100 Subject: Revert "Use standard C99 (and Qt) types for 64-bit integers" This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9. --- src/db.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/db.cpp') diff --git a/src/db.cpp b/src/db.cpp index af2ae834dd..f43b2a5656 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -3,8 +3,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#include - #include "headers.h" #include "db.h" #include "net.h" @@ -16,7 +14,7 @@ using namespace boost; unsigned int nWalletDBUpdated; -uint64_t nAccountingEntryNumber = 0; +uint64 nAccountingEntryNumber = 0; @@ -707,12 +705,12 @@ bool CWalletDB::WriteAccountingEntry(const CAccountingEntry& acentry) return Write(boost::make_tuple(string("acentry"), acentry.strAccount, ++nAccountingEntryNumber), acentry); } -int64_t CWalletDB::GetAccountCreditDebit(const string& strAccount) +int64 CWalletDB::GetAccountCreditDebit(const string& strAccount) { list entries; ListAccountCreditDebit(strAccount, entries); - int64_t nCreditDebit = 0; + int64 nCreditDebit = 0; BOOST_FOREACH (const CAccountingEntry& entry, entries) nCreditDebit += entry.nCreditDebit; @@ -732,7 +730,7 @@ void CWalletDB::ListAccountCreditDebit(const string& strAccount, list> strAccount; - uint64_t nNumber; + uint64 nNumber; ssKey >> nNumber; if (nNumber > nAccountingEntryNumber) nAccountingEntryNumber = nNumber; @@ -901,7 +899,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) } else if (strType == "pool") { - int64_t nIndex; + int64 nIndex; ssKey >> nIndex; pwallet->setKeyPool.insert(nIndex); } @@ -991,7 +989,7 @@ void ThreadFlushWalletDB(void* parg) unsigned int nLastSeen = nWalletDBUpdated; unsigned int nLastFlushed = nWalletDBUpdated; - int64_t nLastWalletUpdate = GetTime(); + int64 nLastWalletUpdate = GetTime(); while (!fShutdown) { Sleep(500); @@ -1023,7 +1021,7 @@ void ThreadFlushWalletDB(void* parg) printf("%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); printf("Flushing wallet.dat\n"); nLastFlushed = nWalletDBUpdated; - int64_t nStart = GetTimeMillis(); + int64 nStart = GetTimeMillis(); // Flush wallet.dat so it's self contained CloseDb(strFile); -- cgit v1.2.3