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-cbr.cpp b/apps/ndn-consumer-cbr.cpp
index f64ae22..743cb26 100644
--- a/apps/ndn-consumer-cbr.cpp
+++ b/apps/ndn-consumer-cbr.cpp
@@ -30,7 +30,7 @@
#include "ns3/integer.h"
#include "ns3/double.h"
-#include "ns3/ndn-app-face.hpp"
+#include "model/ndn-app-face.hpp"
NS_LOG_COMPONENT_DEFINE("ndn.ConsumerCbr");
@@ -121,22 +121,5 @@
return m_randomType;
}
-///////////////////////////////////////////////////
-// Process incoming packets //
-///////////////////////////////////////////////////
-
-// void
-// Consumer::OnData (const shared_ptr<const Data> &contentObject,
-// const Ptr<const Packet> &payload)
-// {
-// Consumer::OnData (contentObject, payload); // tracing inside
-// }
-
-// void
-// Consumer::OnNack (const shared_ptr<const Interest> &interest)
-// {
-// Consumer::OnNack (interest); // tracing inside
-// }
-
} // namespace ndn
} // namespace ns3