commit 9f936665197bff76a0de76fc427cbdb73fd1d4a5
author dmcoomes <damiancoomes@gmail.com> Thu Mar 02 10:33:09 2017 -0600
committer dmcoomes <damiancoomes@gmail.com> Thu Mar 09 12:12:40 2017 -0600
tree b8b37a07820d182115475ced8f40143b66ae3e00
parent 48daea20d79f0fc110c5af41ac3cce613756ecfc

nlsr: Don't use ndn aliases provided by ndn-cxx/common.hpp

refs: #3983

Change-Id: I31da8d68e0285dcfe9c7d3e5e678c00397d22bef

tests/test-name-prefix-table.cpp

diff --git a/tests/test-name-prefix-table.cpp b/tests/test-name-prefix-table.cpp
index 58e771e..daaafe9 100644
--- a/tests/test-name-prefix-table.cpp
+++ b/tests/test-name-prefix-table.cpp
@@ -32,8 +32,8 @@
 {
 public:
   NamePrefixTableFixture()
-    : face(make_shared<ndn::util::DummyClientFace>(g_ioService))
-    , nlsr(g_ioService, g_scheduler, ndn::ref(*face), g_keyChain)
+    : face(std::make_shared<ndn::util::DummyClientFace>(g_ioService))
+    , nlsr(g_ioService, g_scheduler, std::ref(*face), g_keyChain)
     , lsdb(nlsr.getLsdb())
     , npt(nlsr.getNamePrefixTable())
   {
@@ -41,7 +41,7 @@
   }
 
 public:
-  shared_ptr<ndn::util::DummyClientFace> face;
+  std::shared_ptr<ndn::util::DummyClientFace> face;
   Nlsr nlsr;
 
   Lsdb& lsdb;
@@ -148,7 +148,7 @@
 {
   NamePrefixTable& npt = nlsr.getNamePrefixTable();
   RoutingTablePoolEntry rtpe1("router1", 0);
-  shared_ptr<RoutingTablePoolEntry> rtpePtr = npt.addRtpeToPool(rtpe1);
+  std::shared_ptr<RoutingTablePoolEntry> rtpePtr = npt.addRtpeToPool(rtpe1);
 
   npt.addRtpeToPool(rtpe1);
 
@@ -162,7 +162,7 @@
 {
   NamePrefixTable& npt = nlsr.getNamePrefixTable();
   RoutingTablePoolEntry rtpe1("/ndn/memphis/rtr1", 0);
-  shared_ptr<RoutingTablePoolEntry> rtpePtr = npt.addRtpeToPool(rtpe1);
+  std::shared_ptr<RoutingTablePoolEntry> rtpePtr = npt.addRtpeToPool(rtpe1);
   NamePrefixTableEntry npte1("/ndn/memphis/rtr2");
 
   npt.addEntry("/ndn/memphis/rtr2", "/ndn/memphis/rtr1");
@@ -172,8 +172,8 @@
               npt.m_table.end(),
               npte1);
 
-  std::list<shared_ptr<RoutingTablePoolEntry>> rtpeList = nItr->getRteList();
-  std::list<shared_ptr<RoutingTablePoolEntry>>::iterator rItr =
+  std::list<std::shared_ptr<RoutingTablePoolEntry>> rtpeList = nItr->getRteList();
+  std::list<std::shared_ptr<RoutingTablePoolEntry>>::iterator rItr =
     std::find(rtpeList.begin(),
               rtpeList.end(),
               rtpePtr);
@@ -198,7 +198,7 @@
               npt.m_table.end(),
               npte1);
 
-  std::list<shared_ptr<RoutingTablePoolEntry>> rtpeList = nItr->getRteList();
+  std::list<std::shared_ptr<RoutingTablePoolEntry>> rtpeList = nItr->getRteList();
 
   BOOST_CHECK_EQUAL(rtpeList.size(), 1);
   BOOST_CHECK_EQUAL(npt.m_rtpool.size(), 1);