diff options
| author | MarcoFalke <[email protected]> | 2018-05-22 06:44:29 -0400 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-05-22 06:44:44 -0400 |
| commit | 6916024768ec57a00f54224640ab4e4871d2a30a (patch) | |
| tree | 2e7dceb56f9e71f2139bca2567bc8c65b49f0fdf | |
| parent | Merge #13297: [wallet] Fix incorrect comment for DeriveNewSeed. (diff) | |
| parent | trivial: Mark overrides as such. (diff) | |
| download | discoin-6916024768ec57a00f54224640ab4e4871d2a30a.tar.xz discoin-6916024768ec57a00f54224640ab4e4871d2a30a.zip | |
Merge #13282: trivial: Mark overrides as such.
60ebc7da4c trivial: Mark overrides as such. (Daniel Kraft)
Pull request description:
This trivial change adds the `override` keyword to some methods that override virtual base class / interface methods. This ensures that any future changes to the interface's method signatures which are not correctly mirrored in the subclasses will break at compile time with a clear error message, rather than at runtime.
Tree-SHA512: cc1bfa5f03b5e29d20e3eab07b0b5fa2f77b47f79e08263dbff43e4f463e9dd8f4f537e2c8c9b6cb3663220dcf40cfd77723cd9fcbd623c9efc90a4cd44facfc
| -rw-r--r-- | src/bench/bench.h | 12 | ||||
| -rw-r--r-- | src/test/validation_block_tests.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/bench/bench.h b/src/bench/bench.h index e15cb8186..5d131c2aa 100644 --- a/src/bench/bench.h +++ b/src/bench/bench.h @@ -111,9 +111,9 @@ public: class ConsolePrinter : public Printer { public: - void header(); - void result(const State& state); - void footer(); + void header() override; + void result(const State& state) override; + void footer() override; }; // creates box plot with plotly.js @@ -121,9 +121,9 @@ class PlotlyPrinter : public Printer { public: PlotlyPrinter(std::string plotly_url, int64_t width, int64_t height); - void header(); - void result(const State& state); - void footer(); + void header() override; + void result(const State& state) override; + void footer() override; private: std::string m_plotly_url; diff --git a/src/test/validation_block_tests.cpp b/src/test/validation_block_tests.cpp index f83557016..37c4f7913 100644 --- a/src/test/validation_block_tests.cpp +++ b/src/test/validation_block_tests.cpp @@ -25,12 +25,12 @@ struct TestSubscriber : public CValidationInterface { TestSubscriber(uint256 tip) : m_expected_tip(tip) {} - void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) + void UpdatedBlockTip(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload) override { BOOST_CHECK_EQUAL(m_expected_tip, pindexNew->GetBlockHash()); } - void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* pindex, const std::vector<CTransactionRef>& txnConflicted) + void BlockConnected(const std::shared_ptr<const CBlock>& block, const CBlockIndex* pindex, const std::vector<CTransactionRef>& txnConflicted) override { BOOST_CHECK_EQUAL(m_expected_tip, block->hashPrevBlock); BOOST_CHECK_EQUAL(m_expected_tip, pindex->pprev->GetBlockHash()); @@ -38,7 +38,7 @@ struct TestSubscriber : public CValidationInterface { m_expected_tip = block->GetHash(); } - void BlockDisconnected(const std::shared_ptr<const CBlock>& block) + void BlockDisconnected(const std::shared_ptr<const CBlock>& block) override { BOOST_CHECK_EQUAL(m_expected_tip, block->GetHash()); |