Use standard C99 (and Qt) types for 64-bit integers

This commit is contained in:
Luke Dashjr
2011-12-20 16:52:59 -05:00
parent 781c06c0f5
commit 21d9f36781
58 changed files with 526 additions and 442 deletions

View File

@@ -5,6 +5,8 @@
#ifndef BITCOIN_DB_H
#define BITCOIN_DB_H
#include <stdint.h>
#include "key.h"
#include <map>
@@ -317,7 +319,7 @@ bool LoadAddresses();
class CKeyPool
{
public:
int64 nTime;
int64_t nTime;
std::vector<unsigned char> vchPubKey;
CKeyPool()
@@ -456,18 +458,18 @@ public:
return Write(std::string("defaultkey"), vchPubKey);
}
bool ReadPool(int64 nPool, CKeyPool& keypool)
bool ReadPool(int64_t nPool, CKeyPool& keypool)
{
return Read(std::make_pair(std::string("pool"), nPool), keypool);
}
bool WritePool(int64 nPool, const CKeyPool& keypool)
bool WritePool(int64_t nPool, const CKeyPool& keypool)
{
nWalletDBUpdated++;
return Write(std::make_pair(std::string("pool"), nPool), keypool);
}
bool ErasePool(int64 nPool)
bool ErasePool(int64_t nPool)
{
nWalletDBUpdated++;
return Erase(std::make_pair(std::string("pool"), nPool));
@@ -489,7 +491,7 @@ public:
bool ReadAccount(const std::string& strAccount, CAccount& account);
bool WriteAccount(const std::string& strAccount, const CAccount& account);
bool WriteAccountingEntry(const CAccountingEntry& acentry);
int64 GetAccountCreditDebit(const std::string& strAccount);
int64_t GetAccountCreditDebit(const std::string& strAccount);
void ListAccountCreditDebit(const std::string& strAccount, std::list<CAccountingEntry>& acentries);
int LoadWallet(CWallet* pwallet);