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-integrated/test-validator.cpp

diff --git a/tests-integrated/test-validator.cpp b/tests-integrated/test-validator.cpp
index c94ad79..2fd729d 100644
--- a/tests-integrated/test-validator.cpp
+++ b/tests-integrated/test-validator.cpp
@@ -47,9 +47,9 @@
     , m_wasValidated(false)
   {
     m_face.setInterestFilter(m_keyPrefix,
-                             ndn::bind(&ValidatorFixture::onKeyInterest, this, _1, _2),
-                             ndn::bind(&ValidatorFixture::onKeyPrefixRegSuccess, this, _1),
-                             ndn::bind(&ValidatorFixture::registrationFailed, this, _1, _2));
+                             std::bind(&ValidatorFixture::onKeyInterest, this, _1, _2),
+                             std::bind(&ValidatorFixture::onKeyPrefixRegSuccess, this, _1),
+                             std::bind(&ValidatorFixture::registrationFailed, this, _1, _2));
 
     m_keyChain.createIdentity(m_identity);
     ndn::Name certName = m_keyChain.getDefaultCertificateNameForIdentity(m_identity);
@@ -137,7 +137,7 @@
     if (certName != m_cert->getName().getPrefix(-1))
       return; //No such a cert
 
-    shared_ptr<ndn::Data> data = make_shared<ndn::Data>(interestName);
+    std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(interestName);
     data->setContent(m_cert->wireEncode());
     m_keyChain.signWithSha256(*data);
 
@@ -158,13 +158,13 @@
   }
 
   void
-  onValidated(const ndn::shared_ptr<const ndn::Data>& data)
+  onValidated(const std::shared_ptr<const ndn::Data>& data)
   {
     m_wasValidated = true;
   }
 
   void
-  onValidationFailed(const ndn::shared_ptr<const ndn::Data>& data,
+  onValidationFailed(const std::shared_ptr<const ndn::Data>& data,
                      const std::string& failureInfo)
   {
     std::cerr << "Failure Info: " << failureInfo << std::endl;
@@ -172,11 +172,11 @@
   }
 
   void
-  validate(const ndn::shared_ptr<const ndn::Data>& data)
+  validate(const std::shared_ptr<const ndn::Data>& data)
   {
     m_validator.validate(*data,
-                         bind(&ValidatorFixture::onValidated, this, _1),
-                         bind(&ValidatorFixture::onValidationFailed, this, _1, _2));
+                         std::bind(&ValidatorFixture::onValidated, this, _1),
+                         std::bind(&ValidatorFixture::onValidationFailed, this, _1, _2));
   }
 
   void
@@ -190,13 +190,13 @@
   ndn::Face m_face2;
   ndn::Scheduler m_scheduler;
   const ndn::Name m_keyPrefix;
-  ndn::shared_ptr<ndn::CertificateCacheTtl> m_certificateCache;
+  std::shared_ptr<ndn::CertificateCacheTtl> m_certificateCache;
   security::CertificateStore m_certStore;
   nlsr::Validator m_validator;
 
   ndn::KeyChain m_keyChain;
   ndn::Name m_identity;
-  ndn::shared_ptr<ndn::IdentityCertificate> m_cert;
+  std::shared_ptr<ndn::IdentityCertificate> m_cert;
 
   bool m_wasValidated;
 };
@@ -205,13 +205,13 @@
 {
   ndn::Name dataName = m_identity;
   dataName.append("INFO").append("neighbor").append("version");
-  ndn::shared_ptr<ndn::Data> data = ndn::make_shared<ndn::Data>(dataName);
+  std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(dataName);
   m_keyChain.signByIdentity(*data, m_identity);
 
   m_scheduler.scheduleEvent(ndn::time::milliseconds(200),
-                            ndn::bind(&ValidatorFixture::validate, this, data));
+                            std::bind(&ValidatorFixture::validate, this, data));
   m_scheduler.scheduleEvent(ndn::time::milliseconds(1000),
-                            ndn::bind(&ValidatorFixture::terminate, this));
+                            std::bind(&ValidatorFixture::terminate, this));
   BOOST_REQUIRE_NO_THROW(m_face.processEvents());
 
   BOOST_CHECK(m_wasValidated);
@@ -227,7 +227,7 @@
 
   // Create an operator cert signed by the trust anchor
   ndn::Name keyName = m_keyChain.generateRsaKeyPairAsDefault(opIdentity, true);
-  shared_ptr<ndn::IdentityCertificate> opCert =
+  std::shared_ptr<ndn::IdentityCertificate> opCert =
     m_keyChain.prepareUnsignedIdentityCertificate(keyName,
                                                   m_identity,
                                                   ndn::time::system_clock::now(),
@@ -240,14 +240,14 @@
   // Sign data with operator cert
   ndn::Name dataName = opIdentity;
   dataName.append("INFO").append("neighbor").append("version");
-  ndn::shared_ptr<ndn::Data> data = ndn::make_shared<ndn::Data>(dataName);
+  std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(dataName);
   m_keyChain.signByIdentity(*data, opIdentity);
 
   // Check without cert in CertificateStore
   m_scheduler.scheduleEvent(ndn::time::milliseconds(200),
-                            ndn::bind(&ValidatorFixture::validate, this, data));
+                            std::bind(&ValidatorFixture::validate, this, data));
   m_scheduler.scheduleEvent(ndn::time::milliseconds(1000),
-                            ndn::bind(&ValidatorFixture::terminate, this));
+                            std::bind(&ValidatorFixture::terminate, this));
 
   BOOST_REQUIRE_NO_THROW(m_face.processEvents());
   BOOST_CHECK_EQUAL(m_wasValidated, false);
@@ -256,9 +256,9 @@
   m_certStore.insert(opCert);
 
   m_scheduler.scheduleEvent(ndn::time::milliseconds(200),
-                            ndn::bind(&ValidatorFixture::validate, this, data));
+                            std::bind(&ValidatorFixture::validate, this, data));
   m_scheduler.scheduleEvent(ndn::time::milliseconds(1000),
-                            ndn::bind(&ValidatorFixture::terminate, this));
+                            std::bind(&ValidatorFixture::terminate, this));
 
   BOOST_REQUIRE_NO_THROW(m_face.processEvents());
   BOOST_CHECK(m_wasValidated);