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/publisher/segment-publisher.hpp

diff --git a/src/publisher/segment-publisher.hpp b/src/publisher/segment-publisher.hpp
index 43c2efb..82109eb 100644
--- a/src/publisher/segment-publisher.hpp
+++ b/src/publisher/segment-publisher.hpp
@@ -32,10 +32,10 @@
 namespace nlsr {
 
 /*! \brief provides a publisher of Status Dataset or other segmented octet stream
-    \sa http://redmine.named-data.net/projects/nfd/wiki/StatusDataset
+    \sa https://redmine.named-data.net/projects/nfd/wiki/StatusDataset
  */
 template <class FaceBase>
-class SegmentPublisher : ndn::noncopyable
+class SegmentPublisher : boost::noncopyable
 {
 public:
   SegmentPublisher(FaceBase& face,
@@ -91,7 +91,7 @@
       ndn::Name segmentName(segmentPrefix);
       segmentName.appendSegment(segmentNo);
 
-      ndn::shared_ptr<ndn::Data> data = ndn::make_shared<ndn::Data>(segmentName);
+      std::shared_ptr<ndn::Data> data = std::make_shared<ndn::Data>(segmentName);
       data->setContent(segmentBegin, segmentEnd - segmentBegin);
       data->setFreshnessPeriod(m_freshnessPeriod);
 
@@ -113,7 +113,7 @@
 
 private:
   void
-  publishSegment(ndn::shared_ptr<ndn::Data>& data, const ndn::security::SigningInfo& signingInfo)
+  publishSegment(std::shared_ptr<ndn::Data>& data, const ndn::security::SigningInfo& signingInfo)
   {
     m_keyChain.sign(*data, signingInfo);
     m_face.put(*data);