commit feddc3c0545b31fa58fbb74536eeff723cbeaaa7
author Junxiao Shi <git@mail1.yoursunny.com> Thu Jan 17 19:06:00 2019 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Thu Jan 17 19:06:00 2019 +0000
tree 6a18b3abad7451bf577c60f3b0094b39816cd0c6
parent 9120cee21d2e41980edc92234de0bdba8878e598

core: use ndn-cxx scheduler::ScopedEventId

refs #4698

Change-Id: I5ab56855fb22824e129fd7e3ccfb53174cf34f82

rib/readvertise/readvertise.cpp

diff --git a/rib/readvertise/readvertise.cpp b/rib/readvertise/readvertise.cpp
index 09715eb..4c51a03 100644
--- a/rib/readvertise/readvertise.cpp
+++ b/rib/readvertise/readvertise.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018,  Regents of the University of California,
+ * Copyright (c) 2014-2019,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -75,7 +75,7 @@
 
   ReadvertisedRouteContainer::iterator rrIt;
   bool isNew = false;
-  std::tie(rrIt, isNew) = m_rrs.emplace(action->prefix, m_scheduler);
+  std::tie(rrIt, isNew) = m_rrs.emplace(action->prefix);
 
   if (!isNew && rrIt->signer != action->signer) {
     NFD_LOG_WARN("add-route " << ribRoute.entry->getName() << '(' << ribRoute.route->faceId <<

rib/readvertise/readvertised-route.hpp

diff --git a/rib/readvertise/readvertised-route.hpp b/rib/readvertise/readvertised-route.hpp
index c2ca848..50be0c4 100644
--- a/rib/readvertise/readvertised-route.hpp
+++ b/rib/readvertise/readvertised-route.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2018,  Regents of the University of California,
+ * Copyright (c) 2014-2019,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -29,7 +29,7 @@
 #include "core/common.hpp"
 
 #include <ndn-cxx/security/signing-info.hpp>
-#include <ndn-cxx/util/scheduler-scoped-event-id.hpp>
+#include <ndn-cxx/util/scheduler.hpp>
 
 namespace nfd {
 namespace rib {
@@ -39,11 +39,11 @@
 class ReadvertisedRoute : noncopyable
 {
 public:
-  ReadvertisedRoute(const Name& prefix, ndn::util::Scheduler& scheduler)
+  explicit
+  ReadvertisedRoute(const Name& prefix)
     : prefix(prefix)
     , nRibRoutes(0)
     , retryDelay(0)
-    , retryEvt(scheduler)
   {
   }