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/publisher/publisher-fixture.hpp

diff --git a/tests/publisher/publisher-fixture.hpp b/tests/publisher/publisher-fixture.hpp
index 4466b9b..477d7a7 100644
--- a/tests/publisher/publisher-fixture.hpp
+++ b/tests/publisher/publisher-fixture.hpp
@@ -19,6 +19,9 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
+#ifndef NLSR_PUBLISHER_FIXTURE_HPP
+#define NLSR_PUBLISHER_FIXTURE_HPP
+
 #include "nlsr.hpp"
 
 #include "../boost-test.hpp"
@@ -33,8 +36,8 @@
 {
 public:
   PublisherFixture()
-    : face(make_shared<ndn::util::DummyClientFace>())
-    , nlsr(g_ioService, g_scheduler, ndn::ref(*face), g_keyChain)
+    : face(std::make_shared<ndn::util::DummyClientFace>())
+    , nlsr(g_ioService, g_scheduler, std::ref(*face), g_keyChain)
     , lsdb(nlsr, g_scheduler, nlsr.getSyncLogicHandler())
   {
   }
@@ -134,7 +137,7 @@
   }
 
 public:
-  shared_ptr<ndn::util::DummyClientFace> face;
+  std::shared_ptr<ndn::util::DummyClientFace> face;
   Nlsr nlsr;
   Lsdb lsdb;
   ndn::KeyChain keyChain;
@@ -142,3 +145,5 @@
 
 } // namespace test
 } // namespace nlsr
+
+#endif // NLSR_PUBLISHER_FIXTURE_HPP

tests/publisher/test-lsdb-dataset-interest-handler.cpp

diff --git a/tests/publisher/test-lsdb-dataset-interest-handler.cpp b/tests/publisher/test-lsdb-dataset-interest-handler.cpp
index 6a2c690..8e9855a 100644
--- a/tests/publisher/test-lsdb-dataset-interest-handler.cpp
+++ b/tests/publisher/test-lsdb-dataset-interest-handler.cpp
@@ -31,7 +31,7 @@
 namespace test {
 
 void
-processDatasetInterest(shared_ptr<ndn::util::DummyClientFace> face,
+processDatasetInterest(std::shared_ptr<ndn::util::DummyClientFace> face,
                        std::function<bool(const ndn::Block&)> isSameType)
 {
   face->processEvents(ndn::time::milliseconds(1));
@@ -50,7 +50,7 @@
 }
 
 void
-checkErrorResponse(shared_ptr<ndn::util::DummyClientFace> face, uint64_t expectedCode)
+checkErrorResponse(std::shared_ptr<ndn::util::DummyClientFace> face, uint64_t expectedCode)
 {
   BOOST_REQUIRE_EQUAL(face->sentData.size(), 1);
 

tests/publisher/test-segment-publisher.cpp

diff --git a/tests/publisher/test-segment-publisher.cpp b/tests/publisher/test-segment-publisher.cpp
index 2849457..c6b4fba 100644
--- a/tests/publisher/test-segment-publisher.cpp
+++ b/tests/publisher/test-segment-publisher.cpp
@@ -134,7 +134,7 @@
   }
 
 protected:
-  ndn::shared_ptr<ndn::util::DummyClientFace> m_face;
+  std::shared_ptr<ndn::util::DummyClientFace> m_face;
   const ndn::time::milliseconds m_expectedFreshnessPeriod;
   TestSegmentPublisher<N> m_publisher;
   ndn::EncodingBuffer m_buffer;