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/communication/sync-logic-handler.cpp

diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index 7c00d37..0e40809 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -69,7 +69,7 @@
     int32_t lsaPosition = util::getNameComponentPosition(m_name, LSA_COMPONENT);
 
     if (nlsrPosition < 0 || lsaPosition < 0) {
-      throw Error("Cannot parse update name because expected components are missing");
+      BOOST_THROW_EXCEPTION(Error("Cannot parse update name because expected components are missing"));
     }
 
     ndn::Name networkName = m_name.getSubName(1, nlsrPosition-1);
@@ -154,12 +154,12 @@
 
   // The face's lifetime is managed in main.cpp; SyncSocket should not manage the memory
   // of the object
-  ndn::shared_ptr<ndn::Face> facePtr(&m_syncFace, NullDeleter<ndn::Face>());
+  std::shared_ptr<ndn::Face> facePtr(&m_syncFace, NullDeleter<ndn::Face>());
 
-  m_syncSocket = ndn::make_shared<Sync::SyncSocket>(m_syncPrefix, m_validator, facePtr,
-                                                    ndn::bind(&SyncLogicHandler::onNsyncUpdate,
+  m_syncSocket = std::make_shared<Sync::SyncSocket>(m_syncPrefix, m_validator, facePtr,
+                                                    std::bind(&SyncLogicHandler::onNsyncUpdate,
                                                               this, _1, _2),
-                                                    ndn::bind(&SyncLogicHandler::onNsyncRemoval,
+                                                    std::bind(&SyncLogicHandler::onNsyncRemoval,
                                                               this, _1));
 }
 
@@ -191,7 +191,7 @@
   try {
     originRouter = update.getOriginRouter();
   }
-  catch (std::exception& e) {
+  catch (const std::exception& e) {
     _LOG_WARN("Received malformed sync update");
     return;
   }
@@ -275,7 +275,7 @@
   if (m_syncSocket == nullptr) {
     _LOG_FATAL("Cannot publish routing update; SyncSocket does not exist");
 
-    throw SyncLogicHandler::Error("Cannot publish routing update; SyncSocket does not exist");
+    BOOST_THROW_EXCEPTION(SyncLogicHandler::Error("Cannot publish routing update; SyncSocket does not exist"));
   }
 
   m_sequencingManager.writeSeqNoToFile();

src/communication/sync-logic-handler.hpp

diff --git a/src/communication/sync-logic-handler.hpp b/src/communication/sync-logic-handler.hpp
index 955a9c1..5e0e6a8 100644
--- a/src/communication/sync-logic-handler.hpp
+++ b/src/communication/sync-logic-handler.hpp
@@ -29,6 +29,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <boost/cstdint.hpp>
+#include <boost/throw_exception.hpp>
 
 #include "test-access-control.hpp"
 
@@ -90,9 +91,9 @@
   publishSyncUpdate(const ndn::Name& updatePrefix, uint64_t seqNo);
 
 private:
-  ndn::shared_ptr<ndn::ValidatorNull> m_validator;
+  std::shared_ptr<ndn::ValidatorNull> m_validator;
   ndn::Face& m_syncFace;
-  ndn::shared_ptr<Sync::SyncSocket> m_syncSocket;
+  std::shared_ptr<Sync::SyncSocket> m_syncSocket;
   ndn::Name m_syncPrefix;
 
 private:
@@ -111,4 +112,4 @@
 
 } // namespace nlsr
 
-#endif //NLSR_SYNC_LOGIC_HANDLER_HPP
+#endif // NLSR_SYNC_LOGIC_HANDLER_HPP