Merge pull request #3703

ad54a9b Change new constants in txdb.h to int64_t (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2014-02-19 09:04:04 +01:00
commit 7f080fbef7
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with 4 additions and 4 deletions

View File

@ -85,7 +85,7 @@ void OptionsModel::Init()
#endif
if (!settings.contains("nDatabaseCache"))
settings.setValue("nDatabaseCache", nDefaultDbCache);
settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache);
if (!SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString()))
strOverriddenByCommandLine += "-dbcache ";

View File

@ -19,11 +19,11 @@ class CCoins;
class uint256;
// -dbcache default (MiB)
static const int nDefaultDbCache = 100;
static const int64_t nDefaultDbCache = 100;
// max. -dbcache in (MiB)
static const int nMaxDbCache = sizeof(void*) > 4 ? 4096 : 1024;
static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 4096 : 1024;
// min. -dbcache in (MiB)
static const int nMinDbCache = 4;
static const int64_t nMinDbCache = 4;
/** CCoinsView backed by the LevelDB coin database (chainstate/) */
class CCoinsViewDB : public CCoinsView