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/nlsr.hpp

diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index 705cc76..5399ed8 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -19,11 +19,12 @@
  * NLSR, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  **/
 
-#ifndef NLSR_HPP
-#define NLSR_HPP
+#ifndef NLSR_NLSR_HPP
+#define NLSR_NLSR_HPP
 
 #include <boost/cstdint.hpp>
 #include <stdexcept>
+#include <boost/throw_exception.hpp>
 
 #include <ndn-cxx/face.hpp>
 #include <ndn-cxx/security/key-chain.hpp>
@@ -253,12 +254,12 @@
   }
 
   void
-  loadCertToPublish(ndn::shared_ptr<ndn::IdentityCertificate> certificate)
+  loadCertToPublish(std::shared_ptr<ndn::IdentityCertificate> certificate)
   {
     m_certStore.insert(certificate);
   }
 
-  ndn::shared_ptr<const ndn::IdentityCertificate>
+  std::shared_ptr<const ndn::IdentityCertificate>
   getCertificate(const ndn::Name& certificateNameWithoutVersion)
   {
     shared_ptr<const ndn::IdentityCertificate> cert =
@@ -317,7 +318,7 @@
 
 PUBLIC_WITH_TESTS_ELSE_PRIVATE:
   void
-  addCertificateToCache(ndn::shared_ptr<ndn::IdentityCertificate> certificate)
+  addCertificateToCache(std::shared_ptr<ndn::IdentityCertificate> certificate)
   {
     if (certificate != nullptr) {
       m_certificateCache->insertCertificate(certificate);
@@ -386,7 +387,7 @@
   HelloProtocol m_helloProtocol;
 
 private:
-  ndn::shared_ptr<ndn::CertificateCacheTtl> m_certificateCache;
+  std::shared_ptr<ndn::CertificateCacheTtl> m_certificateCache;
   security::CertificateStore m_certStore;
   Validator m_validator;
   ndn::security::SigningInfo m_signingInfo;
@@ -401,4 +402,4 @@
 
 } // namespace nlsr
 
-#endif //NLSR_HPP
+#endif // NLSR_NLSR_HPP