commit e98480b5d1eb37efdf97b9b4a72b4c4ae7b33100
author Nick Gordon <nmgordon@memphis.edu> Wed May 24 11:23:03 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Tue Aug 22 13:37:21 2017 -0500
tree 20937796cb500e2af23d33f3ab4c2d2fa907ffa3
parent d0a7df337f82f6c4f496ba2e019c8e81c247d631

nlsr: removed references to ndn-cxx/common aliases and improved namespacing

Change-Id: I65e4691305b0157f334fc68d96998c119ef8b03b
refs: #3406

src/lsdb.cpp

diff --git a/src/lsdb.cpp b/src/lsdb.cpp
index 5cfc783..3fed788 100644
--- a/src/lsdb.cpp
+++ b/src/lsdb.cpp
@@ -59,7 +59,8 @@
 
 const ndn::Name::Component Lsdb::NAME_COMPONENT = ndn::Name::Component("lsdb");
 const ndn::time::seconds Lsdb::GRACE_PERIOD = ndn::time::seconds(10);
-const steady_clock::TimePoint Lsdb::DEFAULT_LSA_RETRIEVAL_DEADLINE = steady_clock::TimePoint::min();
+const ndn::time::steady_clock::TimePoint Lsdb::DEFAULT_LSA_RETRIEVAL_DEADLINE =
+  ndn::time::steady_clock::TimePoint::min();
 
 Lsdb::Lsdb(Nlsr& nlsr, ndn::Scheduler& scheduler)
   : m_nlsr(nlsr)
@@ -800,7 +801,7 @@
 }
 
 void
-Lsdb::setLsaRefreshTime(const seconds& lsaRefreshTime)
+Lsdb::setLsaRefreshTime(const ndn::time::seconds& lsaRefreshTime)
 {
   m_lsaRefreshTime = lsaRefreshTime;
 }
@@ -957,13 +958,13 @@
 
 void
 Lsdb::expressInterest(const ndn::Name& interestName, uint32_t timeoutCount,
-                      steady_clock::TimePoint deadline)
+                      ndn::time::steady_clock::TimePoint deadline)
 {
   // increment SENT_LSA_INTEREST
   lsaIncrementSignal(Statistics::PacketType::SENT_LSA_INTEREST);
 
   if (deadline == DEFAULT_LSA_RETRIEVAL_DEADLINE) {
-    deadline = steady_clock::now() + ndn::time::seconds(static_cast<int>(LSA_REFRESH_TIME_MAX));
+    deadline = ndn::time::steady_clock::now() + ndn::time::seconds(static_cast<int>(LSA_REFRESH_TIME_MAX));
   }
   // The first component of the interest is the name.
   ndn::Name lsaName = interestName.getSubName(0, interestName.size()-1);