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/chainparams.h | |
| 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/chainparams.h')
| -rw-r--r-- | src/chainparams.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/chainparams.h b/src/chainparams.h index bfefe242b7..bb95b3aa4a 100644 --- a/src/chainparams.h +++ b/src/chainparams.h @@ -74,7 +74,7 @@ public: const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; } const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; } const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; } - virtual const Checkpoints::CCheckpointData& Checkpoints() const = 0; + const Checkpoints::CCheckpointData& Checkpoints() const { return checkpointData; } protected: CChainParams() {} @@ -96,6 +96,7 @@ protected: bool fRequireStandard; bool fMineBlocksOnDemand; bool fTestnetToBeDeprecatedFieldRPC; + Checkpoints::CCheckpointData checkpointData; }; /** |