helper+model: GlobalRoutingHelper now interacts with NFD
This commit also changes uses of boost::tuple with std::tuple
diff --git a/model/ndn-global-router.cpp b/model/ndn-global-router.cpp
index b718689..634678f 100644
--- a/model/ndn-global-router.cpp
+++ b/model/ndn-global-router.cpp
@@ -20,8 +20,8 @@
#include "ndn-global-router.hpp"
-#include "ndn-l3-protocol.hpp"
-#include "ndn-face.hpp"
+#include "model/ndn-l3-protocol.hpp"
+#include "model/ndn-face.hpp"
#include "ns3/channel.h"
@@ -75,7 +75,7 @@
void
GlobalRouter::AddIncidency(shared_ptr<Face> face, Ptr<GlobalRouter> gr)
{
- m_incidencies.push_back(boost::make_tuple(this, face, gr));
+ m_incidencies.push_back(std::make_tuple(this, face, gr));
}
GlobalRouter::IncidencyList&