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

src/validator.hpp

diff --git a/src/validator.hpp b/src/validator.hpp
index ebcd3d0..04b2ea5 100644
--- a/src/validator.hpp
+++ b/src/validator.hpp
@@ -45,7 +45,7 @@
   explicit
   Validator(ndn::Face& face,
             const ndn::Name broadcastPrefix,
-            const ndn::shared_ptr<ndn::CertificateCache>& cache,
+            const std::shared_ptr<ndn::CertificateCache>& cache,
             security::CertificateStore& certStore,
             const int stepLimit = 10)
     : ndn::ValidatorConfig(face, cache, ndn::ValidatorConfig::DEFAULT_GRACE_INTERVAL, stepLimit)
@@ -73,7 +73,7 @@
   }
 
 protected:
-  typedef std::vector<ndn::shared_ptr<ndn::ValidationRequest>> NextSteps;
+  typedef std::vector<std::shared_ptr<ndn::ValidationRequest>> NextSteps;
 
   virtual void
   afterCheckPolicy(const NextSteps& nextSteps,
@@ -84,16 +84,16 @@
       return;
     }
 
-    for (const shared_ptr<ndn::ValidationRequest>& request : nextSteps) {
+    for (const std::shared_ptr<ndn::ValidationRequest>& request : nextSteps) {
 
       ndn::Interest& interest = request->m_interest;
 
       // Look for certificate in permanent storage
-      shared_ptr<const ndn::IdentityCertificate> cert = m_certStore.find(interest.getName());
+      std::shared_ptr<const ndn::IdentityCertificate> cert = m_certStore.find(interest.getName());
 
       if (cert != nullptr) {
         // If the certificate is found, no reason to express interest
-        shared_ptr<ndn::Data> data = make_shared<ndn::Data>(interest.getName());
+        std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(interest.getName());
         data->setContent(cert->wireEncode());
 
         Validator::onData(interest, *data, request);
@@ -106,8 +106,8 @@
 
         // Attempt to fetch the certificate
         m_face->expressInterest(interest,
-                                bind(&Validator::onData, this, _1, _2, request),
-                                bind(&Validator::onTimeout,
+                                std::bind(&Validator::onData, this, _1, _2, request),
+                                std::bind(&Validator::onTimeout,
                                      this, _1, request->m_nRetries,
                                      onFailure,
                                      request));
@@ -115,10 +115,10 @@
     }
   }
 
-  virtual ndn::shared_ptr<const ndn::Data>
+  virtual std::shared_ptr<const ndn::Data>
   preCertificateValidation(const ndn::Data& data)
   {
-    ndn::shared_ptr<ndn::Data> internalData = ndn::make_shared<ndn::Data>();
+    std::shared_ptr<ndn::Data> internalData = std::make_shared<ndn::Data>();
     internalData->wireDecode(data.getContent().blockFromValue());
     return internalData;
   }