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.hpp b/apps/ndn-consumer.hpp
index 25de4cd..30ccc7c 100644
--- a/apps/ndn-consumer.hpp
+++ b/apps/ndn-consumer.hpp
@@ -25,10 +25,14 @@
#include "ns3/ndnSIM/model/ndn-common.hpp"
#include "ndn-app.hpp"
+
#include "ns3/random-variable.h"
#include "ns3/nstime.h"
#include "ns3/data-rate.h"
-#include "ns3/ndn-rtt-estimator.hpp"
+
+#include "ns3/ndnSIM/model/ndn-common.hpp"
+#include "ns3/ndnSIM/utils/ndn-rtt-estimator.hpp"
+#include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.hpp"
#include <set>
#include <map>
@@ -58,12 +62,6 @@
virtual ~Consumer(){};
// From App
- // virtual void
- // OnInterest (const shared_ptr<const Interest> &interest);
-
- virtual void
- OnNack(shared_ptr<const Interest> interest);
-
virtual void
OnData(shared_ptr<const Data> contentObject);