commit b84bd3a8c4f76905480c5c70ce9617b2280e5720
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Apr 22 02:21:45 2016 +0200
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Apr 27 12:15:06 2016 -0700
tree 93728e4d710ba71a6d17a5f6fd8100e26dda4d0d
parent cafae244731c410bc108861bc926f8ead229cd94

common: remove DECL_FINAL/OVERRIDE macros; use C++11 keywords directly

Change-Id: I71a148b0df7c95387b2caa8e2b9fe93b03ca2399
Refs: #3599

tests/daemon/fw/dummy-strategy.hpp

diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index 33d2656..25623cb 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -1,12 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014,  Regents of the University of California,
- *                      Arizona Board of Regents,
- *                      Colorado State University,
- *                      University Pierre & Marie Curie, Sorbonne University,
- *                      Washington University in St. Louis,
- *                      Beijing Institute of Technology,
- *                      The University of Memphis
+ * Copyright (c) 2014-2016,  Regents of the University of California,
+ *                           Arizona Board of Regents,
+ *                           Colorado State University,
+ *                           University Pierre & Marie Curie, Sorbonne University,
+ *                           Washington University in St. Louis,
+ *                           Beijing Institute of Technology,
+ *                           The University of Memphis.
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -53,14 +53,15 @@
    *  otherwise, reject pending Interest action is invoked.
    */
   virtual void
-  afterReceiveInterest(const Face& inFace, const Interest& interest,
+  afterReceiveInterest(const Face& inFace,
+                       const Interest& interest,
                        shared_ptr<fib::Entry> fibEntry,
-                       shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+                       shared_ptr<pit::Entry> pitEntry) override
   {
     ++afterReceiveInterest_count;
     if (wantAfterReceiveInterestCalls) {
-      afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(),
-        interest, fibEntry, pitEntry));
+      afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(), interest,
+                                                          fibEntry, pitEntry));
     }
 
     if (interestOutFace) {
@@ -73,21 +74,23 @@
 
   virtual void
   beforeSatisfyInterest(shared_ptr<pit::Entry> pitEntry,
-                        const Face& inFace, const Data& data) DECL_OVERRIDE
+                        const Face& inFace,
+                        const Data& data) override
   {
     ++beforeSatisfyInterest_count;
   }
 
   virtual void
-  beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+  beforeExpirePendingInterest(shared_ptr<pit::Entry> pitEntry) override
   {
     ++beforeExpirePendingInterest_count;
   }
 
   virtual void
-  afterReceiveNack(const Face& inFace, const lp::Nack& nack,
+  afterReceiveNack(const Face& inFace,
+                   const lp::Nack& nack,
                    shared_ptr<fib::Entry> fibEntry,
-                   shared_ptr<pit::Entry> pitEntry) DECL_OVERRIDE
+                   shared_ptr<pit::Entry> pitEntry) override
   {
     ++afterReceiveNack_count;
   }
@@ -102,7 +105,6 @@
   int beforeSatisfyInterest_count;
   int beforeExpirePendingInterest_count;
   int afterReceiveNack_count;
-
 };
 
 } // namespace tests