fw: add override specifier to Strategy triggers
refs #2281
Change-Id: I5357ac6a93260492900d24c8955fdd7397ef2d27
diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index 83af2fa..50de93e 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -47,7 +47,7 @@
afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry)
+ shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
{
++m_afterReceiveInterest_count;
@@ -61,13 +61,13 @@
virtual void
beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
- const Face& inFace, const Data& data)
+ const Face& inFace, const Data& data) DECL_OVERRIDE
{
++m_beforeSatisfyInterest_count;
}
virtual void
- beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry)
+ beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
{
++m_beforeExpirePendingInterest_count;
}
diff --git a/tests/daemon/fw/strategy-tester.hpp b/tests/daemon/fw/strategy-tester.hpp
index 260a196..a1b920d 100644
--- a/tests/daemon/fw/strategy-tester.hpp
+++ b/tests/daemon/fw/strategy-tester.hpp
@@ -54,16 +54,16 @@
virtual void
sendInterest(shared_ptr<pit::Entry> pitEntry,
shared_ptr<Face> outFace,
- bool wantNewNonce = false);
+ bool wantNewNonce = false) DECL_OVERRIDE;
virtual void
- rejectPendingInterest(shared_ptr<pit::Entry> pitEntry);
+ rejectPendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE;
public:
- typedef boost::tuple<shared_ptr<pit::Entry>, shared_ptr<Face> > SendInterestArgs;
+ typedef boost::tuple<shared_ptr<pit::Entry>, shared_ptr<Face>> SendInterestArgs;
std::vector<SendInterestArgs> m_sendInterestHistory;
- typedef boost::tuple<shared_ptr<pit::Entry> > RejectPendingInterestArgs;
+ typedef boost::tuple<shared_ptr<pit::Entry>> RejectPendingInterestArgs;
std::vector<RejectPendingInterestArgs> m_rejectPendingInterestHistory;
};
diff --git a/tests/daemon/table/measurements-accessor.cpp b/tests/daemon/table/measurements-accessor.cpp
index 8d09ca4..8668368 100644
--- a/tests/daemon/table/measurements-accessor.cpp
+++ b/tests/daemon/table/measurements-accessor.cpp
@@ -27,35 +27,26 @@
#include "fw/strategy.hpp"
#include "tests/test-common.hpp"
+#include "../fw/dummy-strategy.hpp"
namespace nfd {
namespace tests {
BOOST_FIXTURE_TEST_SUITE(TableMeasurementsAccessor, BaseFixture)
-class MeasurementsAccessorTestStrategy : public fw::Strategy
+class MeasurementsAccessorTestStrategy : public DummyStrategy
{
public:
MeasurementsAccessorTestStrategy(Forwarder& forwarder, const Name& name)
- : Strategy(forwarder, name)
+ : DummyStrategy(forwarder, name)
{
}
virtual
~MeasurementsAccessorTestStrategy()
-
{
}
- virtual void
- afterReceiveInterest(const Face& inFace,
- const Interest& interest,
- shared_ptr<fib::Entry> fibEntry,
- shared_ptr<pit::Entry> pitEntry)
- {
- BOOST_ASSERT(false);
- }
-
public: // accessors
MeasurementsAccessor&
getMeasurements_accessor()