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/utils/batches.cpp b/utils/batches.cpp
index 6f593e3..bce3d96 100644
--- a/utils/batches.cpp
+++ b/utils/batches.cpp
@@ -28,7 +28,7 @@
operator<<(std::ostream& os, const Batches& batch)
{
for (Batches::const_iterator i = batch.begin(); i != batch.end(); i++)
- os << i->get<0>() << " " << i->get<1>() << " ";
+ os << std::get<0>(*i) << " " << std::get<1>(*i) << " ";
return os;
}
diff --git a/utils/batches.hpp b/utils/batches.hpp
index 457210f..bd04d9a 100644
--- a/utils/batches.hpp
+++ b/utils/batches.hpp
@@ -25,7 +25,7 @@
#include "ns3/attribute-helper.h"
#include "ns3/nstime.h"
#include <list>
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
namespace ns3 {
@@ -34,7 +34,7 @@
* @brief Class representing sets of (time, number) tuples with support of reading writing to
* streams
*/
-class Batches : public std::list<boost::tuple<Time, uint32_t>> {
+class Batches : public std::list<std::tuple<Time, uint32_t>> {
public:
/**
* @brief Default constructor
@@ -49,7 +49,7 @@
void
Add(const Time& when, uint32_t amount)
{
- push_back(boost::make_tuple<Time, uint32_t>(when, amount));
+ push_back(std::make_tuple(when, amount));
}
};