commit e98480b5d1eb37efdf97b9b4a72b4c4ae7b33100
author Nick Gordon <nmgordon@memphis.edu> Wed May 24 11:23:03 2017 -0500
committer Nick Gordon <nmgordon@memphis.edu> Tue Aug 22 13:37:21 2017 -0500
tree 20937796cb500e2af23d33f3ab4c2d2fa907ffa3
parent d0a7df337f82f6c4f496ba2e019c8e81c247d631

nlsr: removed references to ndn-cxx/common aliases and improved namespacing

Change-Id: I65e4691305b0157f334fc68d96998c119ef8b03b
refs: #3406

src/communication/sync-logic-handler.cpp

diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index c43a070..5a4d709 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -32,9 +32,6 @@
 
 INIT_LOGGER("SyncLogicHandler");
 
-using namespace ndn;
-using namespace std;
-
 const std::string NLSR_COMPONENT = "NLSR";
 const std::string LSA_COMPONENT = "LSA";
 
@@ -75,9 +72,8 @@
   // of the object
   std::shared_ptr<ndn::Face> facePtr(&m_syncFace, NullDeleter<ndn::Face>());
 
-
   m_syncSocket = std::make_shared<chronosync::Socket>(m_syncPrefix, m_nameLsaUserPrefix, *facePtr,
-                                                      bind(&SyncLogicHandler::onChronoSyncUpdate, this, _1));
+                                                      std::bind(&SyncLogicHandler::onChronoSyncUpdate, this, _1));
 
   if (m_confParam.getHyperbolicState() == HYPERBOLIC_STATE_OFF) {
     m_syncSocket->addSyncNode(m_adjLsaUserPrefix);
@@ -88,7 +84,7 @@
 }
 
 void
-SyncLogicHandler::onChronoSyncUpdate(const vector<chronosync::MissingDataInfo>& v)
+SyncLogicHandler::onChronoSyncUpdate(const std::vector<chronosync::MissingDataInfo>& v)
 {
   _LOG_DEBUG("Received ChronoSync update event");
 
@@ -224,7 +220,7 @@
   _LOG_DEBUG("Publishing Sync Update. Prefix: " << updatePrefix << " Seq No: " << seqNo);
 
   ndn::Name updateName(updatePrefix);
-  string data("NoData");
+  std::string data("NoData");
 
   m_syncSocket->publishData(reinterpret_cast<const uint8_t*>(data.c_str()), data.size(),
                             ndn::time::milliseconds(1000), seqNo, updateName);