commit 28eb909f511777c9dca06cab42da9fc11d3afbf0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jun 29 20:15:11 2015 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jun 30 16:07:11 2015 -0700
tree 6369067b13fc3e6c39d985a502c1247ba4de45fa
parent 80342d81d2c8164db448e66617e608eb026651da

Fix compilation failure because of changes in ndn-cxx library

This commit also updates ChronoSync submodule for the same reason.

Change-Id: Ie5e6a4398cf05c8be12ea533503c31eb73e61bbd
Refs: #2996

src/chatroom-info.cpp

diff --git a/src/chatroom-info.cpp b/src/chatroom-info.cpp
index c61babe..81302bb 100644
--- a/src/chatroom-info.cpp
+++ b/src/chatroom-info.cpp
@@ -27,7 +27,7 @@
 
 template<bool T>
 size_t
-ChatroomInfo::wireEncode(ndn::EncodingImpl<T>& block) const
+ChatroomInfo::wireEncode(ndn::EncodingImpl<T>& encoder) const
 {
   size_t totalLength = 0;
 
@@ -57,36 +57,36 @@
   size_t participantsLength = 0;
   for (std::list<Name>::const_reverse_iterator it = m_participants.rbegin();
        it != m_participants.rend(); ++it) {
-    participantsLength += it->wireEncode(block);
+    participantsLength += it->wireEncode(encoder);
   }
-  participantsLength += block.prependVarNumber(participantsLength);
-  participantsLength += block.prependVarNumber(tlv::Participants);
+  participantsLength += encoder.prependVarNumber(participantsLength);
+  participantsLength += encoder.prependVarNumber(tlv::Participants);
   totalLength += participantsLength;
 
   // Manager Prefix
-  size_t managerLength = m_manager.wireEncode(block);
+  size_t managerLength = m_manager.wireEncode(encoder);
   totalLength += managerLength;
-  totalLength += block.prependVarNumber(managerLength);
-  totalLength += block.prependVarNumber(tlv::ManagerPrefix);
+  totalLength += encoder.prependVarNumber(managerLength);
+  totalLength += encoder.prependVarNumber(tlv::ManagerPrefix);
 
   // Chatroom Sync Prefix
-  size_t chatroomSyncPrefixLength = m_syncPrefix.wireEncode(block);
+  size_t chatroomSyncPrefixLength = m_syncPrefix.wireEncode(encoder);
   totalLength += chatroomSyncPrefixLength;
-  totalLength += block.prependVarNumber(chatroomSyncPrefixLength);
-  totalLength += block.prependVarNumber(tlv::ChatroomPrefix);
+  totalLength += encoder.prependVarNumber(chatroomSyncPrefixLength);
+  totalLength += encoder.prependVarNumber(tlv::ChatroomPrefix);
 
   // Trust Model
-  totalLength += ndn::prependNonNegativeIntegerBlock(block, tlv::TrustModel, m_trustModel);
+  totalLength += prependNonNegativeIntegerBlock(encoder, tlv::TrustModel, m_trustModel);
 
   // Chatroom Name
-  size_t chatroomNameLength = m_chatroomName.wireEncode(block);
+  size_t chatroomNameLength = m_chatroomName.wireEncode(encoder);
   totalLength += chatroomNameLength;
-  totalLength += block.prependVarNumber(chatroomNameLength);
-  totalLength += block.prependVarNumber(tlv::ChatroomName);
+  totalLength += encoder.prependVarNumber(chatroomNameLength);
+  totalLength += encoder.prependVarNumber(tlv::ChatroomName);
 
   // Chatroom Info
-  totalLength += block.prependVarNumber(totalLength);
-  totalLength += block.prependVarNumber(tlv::ChatroomInfo);
+  totalLength += encoder.prependVarNumber(totalLength);
+  totalLength += encoder.prependVarNumber(tlv::ChatroomInfo);
 
   return totalLength;
 }