diff options
| author | practicalswift <[email protected]> | 2017-06-20 21:58:56 +0200 |
|---|---|---|
| committer | practicalswift <[email protected]> | 2017-06-28 02:12:06 +0200 |
| commit | aa95947ded93e7e45f222f255baf186433cc11fc (patch) | |
| tree | 5c57ac83b17f7d0ac6095a8e36c359e5f3121ae6 /src/versionbits.cpp | |
| parent | Merge #10659: [qa] blockchain: Pass on closed connection during generate call (diff) | |
| download | discoin-aa95947ded93e7e45f222f255baf186433cc11fc.tar.xz discoin-aa95947ded93e7e45f222f255baf186433cc11fc.zip | |
Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class
Diffstat (limited to 'src/versionbits.cpp')
| -rw-r--r-- | src/versionbits.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/versionbits.cpp b/src/versionbits.cpp index 92c90b7ef..8047e17aa 100644 --- a/src/versionbits.cpp +++ b/src/versionbits.cpp @@ -174,12 +174,12 @@ private: const Consensus::DeploymentPos id; protected: - int64_t BeginTime(const Consensus::Params& params) const { return params.vDeployments[id].nStartTime; } - int64_t EndTime(const Consensus::Params& params) const { return params.vDeployments[id].nTimeout; } - int Period(const Consensus::Params& params) const { return params.nMinerConfirmationWindow; } - int Threshold(const Consensus::Params& params) const { return params.nRuleChangeActivationThreshold; } + int64_t BeginTime(const Consensus::Params& params) const override { return params.vDeployments[id].nStartTime; } + int64_t EndTime(const Consensus::Params& params) const override { return params.vDeployments[id].nTimeout; } + int Period(const Consensus::Params& params) const override { return params.nMinerConfirmationWindow; } + int Threshold(const Consensus::Params& params) const override { return params.nRuleChangeActivationThreshold; } - bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const + bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { return (((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) && (pindex->nVersion & Mask(params)) != 0); } |