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/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 67c00f0..bf4f8f4 100644
--- a/tests/update/test-prefix-update-processor.cpp
+++ b/tests/update/test-prefix-update-processor.cpp
@@ -43,7 +43,7 @@
 {
 public:
   PrefixUpdateFixture()
-    : face(make_shared<ndn::util::DummyClientFace>(g_ioService))
+    : face(std::make_shared<ndn::util::DummyClientFace>(g_ioService))
     , siteIdentity(ndn::Name("/ndn/edu/test-site").appendVersion())
     , opIdentity(ndn::Name(siteIdentity).append(ndn::Name("%C1.Operator")).appendVersion())
     , nlsr(g_ioService, g_scheduler, *face, g_keyChain)
@@ -138,8 +138,8 @@
     // Operator cert
     ndn::Name keyName = keyChain.generateRsaKeyPairAsDefault(opIdentity, true);
 
-    opCert = ndn::make_shared<ndn::IdentityCertificate>();
-    ndn::shared_ptr<ndn::PublicKey> pubKey = keyChain.getPublicKey(keyName);
+    opCert = std::make_shared<ndn::IdentityCertificate>();
+    std::shared_ptr<ndn::PublicKey> pubKey = keyChain.getPublicKey(keyName);
     opCertName = keyName.getPrefix(-1);
     opCertName.append("KEY").append(keyName.get(-1)).append("ID-CERT").appendVersion();
     opCert->setName(opCertName);
@@ -191,16 +191,16 @@
   }
 
 public:
-  shared_ptr<ndn::util::DummyClientFace> face;
+  std::shared_ptr<ndn::util::DummyClientFace> face;
   ndn::KeyChain keyChain;
 
   ndn::Name siteIdentity;
   ndn::Name siteCertName;
-  shared_ptr<IdentityCertificate> siteCert;
+  std::shared_ptr<IdentityCertificate> siteCert;
 
   ndn::Name opIdentity;
   ndn::Name opCertName;
-  shared_ptr<IdentityCertificate> opCert;
+  std::shared_ptr<IdentityCertificate> opCert;
 
   Nlsr nlsr;
   ndn::Name keyPrefix;
@@ -222,7 +222,7 @@
   ndn::Name advertiseCommand("/localhost/nlsr/prefix-update/advertise");
   advertiseCommand.append(parameters.wireEncode());
 
-  shared_ptr<Interest> advertiseInterest = make_shared<Interest>(advertiseCommand);
+  std::shared_ptr<Interest> advertiseInterest = std::make_shared<Interest>(advertiseCommand);
   keyChain.signByIdentity(*advertiseInterest, opIdentity);
 
   face->receive(*advertiseInterest);
@@ -240,7 +240,7 @@
   ndn::Name withdrawCommand("/localhost/nlsr/prefix-update/withdraw");
   withdrawCommand.append(parameters.wireEncode());
 
-  shared_ptr<Interest> withdrawInterest = make_shared<Interest>(withdrawCommand);
+  std::shared_ptr<Interest> withdrawInterest = std::make_shared<Interest>(withdrawCommand);
   keyChain.signByIdentity(*withdrawInterest, opIdentity);
 
   face->receive(*withdrawInterest);
@@ -259,7 +259,7 @@
   ndn::Name advertiseCommand("/localhost/nlsr/prefix-update/advertise");
   advertiseCommand.append(parameters.wireEncode());
 
-  shared_ptr<Interest> advertiseInterest = make_shared<Interest>(advertiseCommand);
+  std::shared_ptr<Interest> advertiseInterest = std::make_shared<Interest>(advertiseCommand);
   keyChain.signByIdentity(*advertiseInterest, opIdentity);
 
   // Command should be rejected