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/update/prefix-update-processor.cpp

diff --git a/src/update/prefix-update-processor.cpp b/src/update/prefix-update-processor.cpp
index 8f3104a..e0c8f3b 100644
--- a/src/update/prefix-update-processor.cpp
+++ b/src/update/prefix-update-processor.cpp
@@ -43,7 +43,7 @@
                                              SyncLogicHandler& sync,
                                              const ndn::Name broadcastPrefix,
                                              ndn::KeyChain& keyChain,
-                                             ndn::shared_ptr<ndn::CertificateCacheTtl> certificateCache,
+                                             std::shared_ptr<ndn::CertificateCacheTtl> certificateCache,
                                              security::CertificateStore& certStore)
   : m_face(face)
   , m_namePrefixList(namePrefixList)
@@ -61,7 +61,7 @@
 {
   _LOG_DEBUG("Setting Interest filter for: " << COMMAND_PREFIX);
 
-  m_face.setInterestFilter(COMMAND_PREFIX, bind(&PrefixUpdateProcessor::onInterest, this, _2));
+  m_face.setInterestFilter(COMMAND_PREFIX, std::bind(&PrefixUpdateProcessor::onInterest, this, _2));
 }
 
 void
@@ -75,8 +75,8 @@
   }
 
   m_validator.validate(request,
-                       bind(&PrefixUpdateProcessor::onCommandValidated, this, _1),
-                       bind(&PrefixUpdateProcessor::onCommandValidationFailed, this, _1, _2));
+                       std::bind(&PrefixUpdateProcessor::onCommandValidated, this, _1),
+                       std::bind(&PrefixUpdateProcessor::onCommandValidationFailed, this, _1, _2));
 }
 
 void
@@ -197,7 +197,7 @@
   ndn::MetaInfo metaInfo;
   metaInfo.setType(ndn::tlv::ContentType_Nack);
 
-  shared_ptr<ndn::Data> responseData = std::make_shared<ndn::Data>(request.getName());
+  std::shared_ptr<ndn::Data> responseData = std::make_shared<ndn::Data>(request.getName());
   responseData->setMetaInfo(metaInfo);
 
   m_keyChain.sign(*responseData);