diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-06 11:33:51 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-06 11:38:39 +0200 |
| commit | 00820f921d8fcaa031e561ee641c50e77a909670 (patch) | |
| tree | 2c7ebfed408c68a504ccda70e552bcb9600b6ae2 /src/init.cpp | |
| parent | 40f5e8dc2ab17b34b24ee6e0391e18ae7065cff9 (diff) | |
| parent | a8cdaf5c962ff9018e2d8411f532eec7355f0623 (diff) | |
| download | bitcoin-00820f921d8fcaa031e561ee641c50e77a909670.tar.xz | |
Merge pull request #6055
a8cdaf5 checkpoints: move the checkpoints enable boolean into main (Cory Fields)
11982d3 checkpoints: Decouple checkpoints from Params (Cory Fields)
6996823 checkpoints: make checkpoints a member of CChainParams (Cory Fields)
9f13a10 checkpoints: store mapCheckpoints in CCheckpointData rather than a pointer (Cory Fields)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index a057dc3ace..00bf7b695a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -739,7 +739,7 @@ bool AppInit2(boost::thread_group& threadGroup) // Checkmempool and checkblockindex default to true in regtest mode mempool.setSanityCheck(GetBoolArg("-checkmempool", chainparams.DefaultConsistencyChecks())); fCheckBlockIndex = GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks()); - Checkpoints::fEnabled = GetBoolArg("-checkpoints", true); + fCheckpointsEnabled = GetBoolArg("-checkpoints", true); // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS); |