commit 89046c1e1980c27a87696af972dc027f3121dafc
author Mickey Sweatt <mickeysweatt@engineering.ucla,edu> Sun Nov 16 20:32:27 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 06 18:39:06 2015 -0800
tree 2aedf9724b4b2b492430886b86cdcccf859f00a4
parent de1f77330fee22e3e88a8d4fb9994fe808857b8a

apps+helper+utils: Fixes of consumer and producer apps to work with the new codebase

This commit also replaces boost::tuple with std::tuple in Batches class

Credits for the commit also to Spyros Mastorakis and Alex Afanasyev

apps/ndn-consumer-batches.cpp

diff --git a/apps/ndn-consumer-batches.cpp b/apps/ndn-consumer-batches.cpp
index b7406ae..5f82a4b 100644
--- a/apps/ndn-consumer-batches.cpp
+++ b/apps/ndn-consumer-batches.cpp
@@ -28,7 +28,7 @@
 #include "ns3/uinteger.h"
 #include "ns3/double.h"
 
-#include "../utils/batches.hpp"
+#include "utils/batches.hpp"
 
 NS_LOG_COMPONENT_DEFINE("ndn.ConsumerBatches");
 
@@ -67,8 +67,8 @@
 
   // std::cout << "Batches: " << batches << "\n";
   for (Batches::const_iterator i = m_batches.begin(); i != m_batches.end(); i++) {
-    Simulator::ScheduleWithContext(GetNode()->GetId(), i->get<0>(), &ConsumerBatches::AddBatch,
-                                   this, i->get<1>());
+    Simulator::ScheduleWithContext(GetNode()->GetId(), std::get<0>(*i), &ConsumerBatches::AddBatch,
+                                   this, std::get<1>(*i));
   }
 }
 
@@ -96,9 +96,5 @@
   }
 }
 
-///////////////////////////////////////////////////
-//          Process incoming packets             //
-///////////////////////////////////////////////////
-
 } // namespace ndn
 } // namespace ns3