diff options
| author | Wladimir J. van der Laan <[email protected]> | 2017-06-28 14:33:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2017-06-28 15:05:23 +0200 |
| commit | 9a941a10101dc720d7d8b425f7778abf2a1b7c36 (patch) | |
| tree | b70c32af24d1a318dfcd39bb63e1e472566733ef /src/test/versionbits_tests.cpp | |
| parent | Merge #10684: Remove no longer used mempool.exists(outpoint) (diff) | |
| parent | Use the override specifier (C++11) where we expect to be overriding the virtu... (diff) | |
| download | discoin-9a941a10101dc720d7d8b425f7778abf2a1b7c36.tar.xz discoin-9a941a10101dc720d7d8b425f7778abf2a1b7c36.zip | |
Merge #10631: Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class
aa95947 Use the override specifier (C++11) where we expect to be overriding the virtual function of a base class (practicalswift)
Tree-SHA512: 3835e9b4ceaa4b2db485a25dfa3e5fe50c2e3ecb22ca9d5331aed7728aa496d4378fb84c0a1a3c47b0adecc10a00bca99cc239cbaf94cf2ce5b4cda497db6023
Diffstat (limited to 'src/test/versionbits_tests.cpp')
| -rw-r--r-- | src/test/versionbits_tests.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/versionbits_tests.cpp b/src/test/versionbits_tests.cpp index faa2383d1..722f6ae05 100644 --- a/src/test/versionbits_tests.cpp +++ b/src/test/versionbits_tests.cpp @@ -22,11 +22,11 @@ private: mutable ThresholdConditionCache cache; public: - int64_t BeginTime(const Consensus::Params& params) const { return TestTime(10000); } - int64_t EndTime(const Consensus::Params& params) const { return TestTime(20000); } - int Period(const Consensus::Params& params) const { return 1000; } - int Threshold(const Consensus::Params& params) const { return 900; } - bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const { return (pindex->nVersion & 0x100); } + int64_t BeginTime(const Consensus::Params& params) const override { return TestTime(10000); } + int64_t EndTime(const Consensus::Params& params) const override { return TestTime(20000); } + int Period(const Consensus::Params& params) const override { return 1000; } + int Threshold(const Consensus::Params& params) const override { return 900; } + bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { return (pindex->nVersion & 0x100); } ThresholdState GetStateFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateFor(pindexPrev, paramsDummy, cache); } int GetStateSinceHeightFor(const CBlockIndex* pindexPrev) const { return AbstractThresholdConditionChecker::GetStateSinceHeightFor(pindexPrev, paramsDummy, cache); } |