commit 5bcb39e2556ea3bb6e7b8860f83fc203f2817b32
author dmcoomes <damiancoomes@gmail.com> Tue Oct 31 15:07:55 2017 -0500
committer dmcoomes <damiancoomes@gmail.com> Wed Nov 01 09:36:53 2017 -0500
tree 85fd1c66b15eaf6a06fca621daeb9b2f2e334ea0
parent 0fa4c779870c675a00c22943ddd88e04e28ab4f4

rename log macros to comply with ISO C++ standard

refs: #4341

Change-Id: Idb05f59660f42c01a7bf014c6fff4125a28327f2

src/lsa.cpp

diff --git a/src/lsa.cpp b/src/lsa.cpp
index 16616c7..45cd33e 100644
--- a/src/lsa.cpp
+++ b/src/lsa.cpp
@@ -108,7 +108,7 @@
     }
   }
   catch (const std::exception& e) {
-    _LOG_ERROR("Could not deserialize from content: " << e.what());
+    NLSR_LOG_ERROR("Could not deserialize from content: " << e.what());
     return false;
   }
   return true;
@@ -123,19 +123,19 @@
 void
 NameLsa::writeLog()
 {
-  _LOG_DEBUG("Name Lsa: ");
-  _LOG_DEBUG("  Origination Router: " << m_origRouter);
-  _LOG_DEBUG("  Ls Type: " << getType());
-  _LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
-  _LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
-  _LOG_DEBUG("  Names: ");
+  NLSR_LOG_DEBUG("Name Lsa: ");
+  NLSR_LOG_DEBUG("  Origination Router: " << m_origRouter);
+  NLSR_LOG_DEBUG("  Ls Type: " << getType());
+  NLSR_LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
+  NLSR_LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
+  NLSR_LOG_DEBUG("  Names: ");
   int i = 1;
   std::list<ndn::Name> nl = m_npl.getNames();
   for (std::list<ndn::Name>::iterator it = nl.begin(); it != nl.end(); it++)
   {
-    _LOG_DEBUG("    Name " << i << ": " << (*it));
+    NLSR_LOG_DEBUG("    Name " << i << ": " << (*it));
   }
-  _LOG_DEBUG("name_lsa_end");
+  NLSR_LOG_DEBUG("name_lsa_end");
 }
 
 CoordinateLsa::CoordinateLsa(const ndn::Name& origR, uint32_t lsn,
@@ -196,7 +196,7 @@
     }
   }
   catch (const std::exception& e) {
-    _LOG_ERROR("Could not deserialize from content: " << e.what());
+    NLSR_LOG_ERROR("Could not deserialize from content: " << e.what());
     return false;
   }
   return true;
@@ -205,15 +205,15 @@
 void
 CoordinateLsa::writeLog()
 {
-  _LOG_DEBUG("Cor Lsa: ");
-  _LOG_DEBUG("  Origination Router: " << m_origRouter);
-  _LOG_DEBUG("  Ls Type: " << getType());
-  _LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
-  _LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
-  _LOG_DEBUG("    Hyperbolic Radius: " << m_corRad);
+  NLSR_LOG_DEBUG("Cor Lsa: ");
+  NLSR_LOG_DEBUG("  Origination Router: " << m_origRouter);
+  NLSR_LOG_DEBUG("  Ls Type: " << getType());
+  NLSR_LOG_DEBUG("  Ls Seq No: " << m_lsSeqNo);
+  NLSR_LOG_DEBUG("  Ls Lifetime: " << m_expirationTimePoint);
+  NLSR_LOG_DEBUG("    Hyperbolic Radius: " << m_corRad);
   int i = 0;
   for(auto const& value: m_angles) {
-    _LOG_DEBUG("    Hyperbolic Theta " << i++ << ": "<< value);
+    NLSR_LOG_DEBUG("    Hyperbolic Theta " << i++ << ": "<< value);
   }
 }
 
@@ -275,7 +275,7 @@
     }
   }
   catch (const std::exception& e) {
-    _LOG_ERROR("Could not deserialize from content: " << e.what());
+    NLSR_LOG_ERROR("Could not deserialize from content: " << e.what());
     return false;
   }
   return true;
@@ -304,7 +304,7 @@
 void
 AdjLsa::writeLog()
 {
-  _LOG_DEBUG(*this);
+  NLSR_LOG_DEBUG(*this);
 }
 
 std::ostream&