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
diff --git a/apps/ndn-consumer-batches.hpp b/apps/ndn-consumer-batches.hpp
index 79b5d2b..a30cc09 100644
--- a/apps/ndn-consumer-batches.hpp
+++ b/apps/ndn-consumer-batches.hpp
@@ -25,7 +25,7 @@
#include "ndn-consumer.hpp"
#include "ns3/traced-value.h"
-#include "../utils/batches.hpp"
+#include "ns3/ndnSIM/utils/batches.hpp"
namespace ns3 {
namespace ndn {
@@ -44,20 +44,6 @@
*/
ConsumerBatches();
- // From App
- // virtual void
- // OnInterest (const shared_ptr<const Interest> &interest);
-
- // virtual void
- // OnNack (const shared_ptr<const Interest> &interest);
-
- // virtual void
- // OnData (const shared_ptr<const Data> &contentObject,
- // const Ptr<const Packet> &payload);
-
- // virtual void
- // OnTimeout (uint32_t sequenceNumber);
-
private:
virtual void
StartApplication(); ///< @brief Called at time specified by Start