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/utility/test-face-controller.cpp

diff --git a/tests/utility/test-face-controller.cpp b/tests/utility/test-face-controller.cpp
index f439ebd..7684256 100644
--- a/tests/utility/test-face-controller.cpp
+++ b/tests/utility/test-face-controller.cpp
@@ -31,15 +31,15 @@
 namespace nlsr {
 namespace test {
 
-using ndn::bind;
-using ndn::shared_ptr;
+using std::bind;
+using std::shared_ptr;
 using ndn::Interest;
 
 class FaceControllerFixture : public BaseFixture
 {
 public:
   FaceControllerFixture()
-    : face(make_shared<ndn::util::DummyClientFace>())
+    : face(std::make_shared<ndn::util::DummyClientFace>())
     , interests(face->sentInterests)
     , controller(*face, keyChain)
     , faceController(g_ioService, controller)
@@ -53,7 +53,7 @@
   }
 
 public:
-  shared_ptr<ndn::util::DummyClientFace> face;
+  std::shared_ptr<ndn::util::DummyClientFace> face;
   ndn::KeyChain keyChain;
   std::vector<Interest>& interests;
   ndn::nfd::Controller controller;
@@ -85,7 +85,7 @@
 {
   faceController.createFace("invalid://256.0.0.1:6363",
                             nullptr,
-                            bind(&FaceControllerFixture::onFailure, this, _1));
+                            std::bind(&FaceControllerFixture::onFailure, this, _1));
 
   face->processEvents(ndn::time::milliseconds(1));