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

tests/test-adjacency-list.cpp

diff --git a/tests/test-adjacency-list.cpp b/tests/test-adjacency-list.cpp
index 9a46a1c..465fd9a 100644
--- a/tests/test-adjacency-list.cpp
+++ b/tests/test-adjacency-list.cpp
@@ -19,8 +19,9 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#include "adjacency-list.hpp"
+#include "common.hpp"
 
+#include "adjacency-list.hpp"
 #include "adjacent.hpp"
 #include "conf-parameter.hpp"
 

tests/test-lsdb.cpp

diff --git a/tests/test-lsdb.cpp b/tests/test-lsdb.cpp
index 2dd6f3e..49501bf 100644
--- a/tests/test-lsdb.cpp
+++ b/tests/test-lsdb.cpp
@@ -123,8 +123,8 @@
   BOOST_CHECK_EQUAL(it->getName(), oldInterestName);
   interests.clear();
 
-  steady_clock::TimePoint deadline = steady_clock::now() +
-                                     ndn::time::seconds(LSA_REFRESH_TIME_MAX);
+  ndn::time::steady_clock::TimePoint deadline = ndn::time::steady_clock::now() +
+    ndn::time::seconds(LSA_REFRESH_TIME_MAX);
 
   // Simulate an LSA interest timeout
   lsdb.onFetchLsaError(ndn::util::SegmentFetcher::ErrorCode::INTEREST_TIMEOUT, "Timeout",

tests/update/test-prefix-update-processor.cpp

diff --git a/tests/update/test-prefix-update-processor.cpp b/tests/update/test-prefix-update-processor.cpp
index 32cacb5..42d9fa0 100644
--- a/tests/update/test-prefix-update-processor.cpp
+++ b/tests/update/test-prefix-update-processor.cpp
@@ -169,7 +169,7 @@
     lsaInterestName.append(sessionTime);
     lsaInterestName.appendNumber(nlsr.getLsdb().getSequencingManager().getNameLsaSeq());
 
-    shared_ptr<Interest> lsaInterest = make_shared<Interest>(lsaInterestName);
+    std::shared_ptr<Interest> lsaInterest = std::make_shared<Interest>(lsaInterestName);
 
     face.receive(*lsaInterest);
     this->advanceClocks(ndn::time::milliseconds(10));