diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-19 09:04:04 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-19 09:04:09 +0100 |
| commit | 7f080fbef7b4cd76a3eb547e9bde5db4e56625da (patch) | |
| tree | c624575a00c11230ad2f2bd9d23611c2b71288e5 /src | |
| parent | 38ebd0fee81393f7945724e758a65908e4671825 (diff) | |
| parent | ad54a9b83f416d6bbd84eaaec55bf1e6f56308b1 (diff) | |
| download | bitcoin-7f080fbef7b4cd76a3eb547e9bde5db4e56625da.tar.xz | |
Merge pull request #3703
ad54a9b Change new constants in txdb.h to int64_t (Wladimir J. van der Laan)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/optionsmodel.cpp | 2 | ||||
| -rw-r--r-- | src/txdb.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 1a460b9278..3b83a5ff62 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -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 "; diff --git a/src/txdb.h b/src/txdb.h index 0512396e97..5eb5731db3 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -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 |