commit f4772d4f217aa095a1eb2c5e37d53d86613dc8a9
author Vince Lehman <vslehman@memphis.edu> Mon Jun 29 14:02:22 2015 -0500
committer Vince Lehman <vslehman@memphis.edu> Mon Jun 29 15:06:29 2015 -0500
tree 6d7703e3993e524b3643c6888b902c1e425e6270
parent 46ccaae829da8ec778d412c98672d3dcb86d7f63

Fix compilation after namespace change in ndn-cxx

refs: #2951

Change-Id: Ia9f3caee4733e7f137b5f6f22f7e154069b37f69

src/tlv/adjacency.cpp

diff --git a/src/tlv/adjacency.cpp b/src/tlv/adjacency.cpp
index e9912b0..3a24356 100644
--- a/src/tlv/adjacency.cpp
+++ b/src/tlv/adjacency.cpp
@@ -45,21 +45,19 @@
 
 template<bool T>
 size_t
-Adjacency::wireEncode(ndn::EncodingImpl<T>& block) const
+Adjacency::wireEncode(ndn::EncodingImpl<T>& encoder) const
 {
   size_t totalLength = 0;
 
-  totalLength += ndn::prependNonNegativeIntegerBlock(block,
-                                                     ndn::tlv::nlsr::Cost,
-                                                     m_cost);
+  totalLength += prependNonNegativeIntegerBlock(encoder, ndn::tlv::nlsr::Cost, m_cost);
 
-  totalLength += block.prependByteArrayBlock(
+  totalLength += encoder.prependByteArrayBlock(
     ndn::tlv::nlsr::Uri, reinterpret_cast<const uint8_t*>(m_uri.c_str()), m_uri.size());
 
-  totalLength += m_name.wireEncode(block);
+  totalLength += m_name.wireEncode(encoder);
 
-  totalLength += block.prependVarNumber(totalLength);
-  totalLength += block.prependVarNumber(ndn::tlv::nlsr::Adjacency);
+  totalLength += encoder.prependVarNumber(totalLength);
+  totalLength += encoder.prependVarNumber(ndn::tlv::nlsr::Adjacency);
 
   return totalLength;
 }

src/tlv/lsa-info.cpp

diff --git a/src/tlv/lsa-info.cpp b/src/tlv/lsa-info.cpp
index e81bdc9..da3f189 100644
--- a/src/tlv/lsa-info.cpp
+++ b/src/tlv/lsa-info.cpp
@@ -49,25 +49,25 @@
 
 template<bool T>
 size_t
-LsaInfo::wireEncode(ndn::EncodingImpl<T>& block) const
+LsaInfo::wireEncode(ndn::EncodingImpl<T>& encoder) const
 {
   size_t totalLength = 0;
 
   // Absence of an ExpirationPeriod signifies non-expiration
   if (!m_hasInfiniteExpirationPeriod) {
-    totalLength += ndn::prependNonNegativeIntegerBlock(block,
-                                                       ndn::tlv::nlsr::ExpirationPeriod,
-                                                       m_expirationPeriod.count());
+    totalLength += prependNonNegativeIntegerBlock(encoder,
+                                                  ndn::tlv::nlsr::ExpirationPeriod,
+                                                  m_expirationPeriod.count());
   }
 
-  totalLength += ndn::prependNonNegativeIntegerBlock(block,
-                                                     ndn::tlv::nlsr::SequenceNumber,
-                                                     m_sequenceNumber);
+  totalLength += prependNonNegativeIntegerBlock(encoder,
+                                                ndn::tlv::nlsr::SequenceNumber,
+                                                m_sequenceNumber);
 
-  totalLength += ndn::prependNestedBlock(block, ndn::tlv::nlsr::OriginRouter, m_originRouter);
+  totalLength += prependNestedBlock(encoder, ndn::tlv::nlsr::OriginRouter, m_originRouter);
 
-  totalLength += block.prependVarNumber(totalLength);
-  totalLength += block.prependVarNumber(ndn::tlv::nlsr::LsaInfo);
+  totalLength += encoder.prependVarNumber(totalLength);
+  totalLength += encoder.prependVarNumber(ndn::tlv::nlsr::LsaInfo);
 
   return totalLength;
 }

tests/publisher/test-segment-publisher.cpp

diff --git a/tests/publisher/test-segment-publisher.cpp b/tests/publisher/test-segment-publisher.cpp
index 0855466..7f34747 100644
--- a/tests/publisher/test-segment-publisher.cpp
+++ b/tests/publisher/test-segment-publisher.cpp
@@ -74,7 +74,7 @@
     size_t totalLength = 0;
     for (int64_t i = 0; i < N; i++)
       {
-        totalLength += ndn::prependNonNegativeIntegerBlock(outBuffer, ndn::tlv::Content, i);
+        totalLength += prependNonNegativeIntegerBlock(outBuffer, ndn::tlv::Content, i);
       }
     m_totalPayloadLength += totalLength;
     return totalLength;