commit 60f4b99ee97dc92b41c94eac5453b043fc3bcb8a
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Fri Nov 07 15:51:38 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 06 14:52:45 2015 -0800
tree 3ba33384cf7845f5fdb2a918f182bb5869ca19a5
parent 592fcba4d4fa64508ed1921a2717d7c173d9dbdb

helper+model: GlobalRoutingHelper now interacts with NFD

This commit also changes uses of boost::tuple with std::tuple

model/ndn-global-router.cpp

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&

model/ndn-global-router.hpp

diff --git a/model/ndn-global-router.hpp b/model/ndn-global-router.hpp
index 0465cb8..ba7990d 100644
--- a/model/ndn-global-router.hpp
+++ b/model/ndn-global-router.hpp
@@ -28,7 +28,7 @@
 #include "ns3/ptr.h"
 
 #include <list>
-#include <boost/tuple/tuple.hpp>
+#include <tuple>
 
 namespace ns3 {
 
@@ -47,7 +47,7 @@
   /**
    * @brief Graph edge
    */
-  typedef boost::tuple<Ptr<GlobalRouter>, shared_ptr<Face>, Ptr<GlobalRouter>> Incidency;
+  typedef std::tuple<Ptr<GlobalRouter>, shared_ptr<Face>, Ptr<GlobalRouter>> Incidency;
   /**
    * @brief List of graph edges
    */
@@ -113,7 +113,7 @@
 protected:
   virtual void
   NotifyNewAggregate(); ///< @brief Notify when the object is aggregated to another object (e.g.,
-  /// Node)
+                        /// Node)
 
 private:
   uint32_t m_id;
@@ -128,7 +128,8 @@
 inline bool
 operator==(const GlobalRouter::Incidency& a, const GlobalRouter::Incidency& b)
 {
-  return a.get<0>() == b.get<0>() && a.get<1>() == b.get<1>() && a.get<2>() == b.get<2>();
+  return std::get<0>(a) == std::get<0>(b) && std::get<1>(a) == std::get<1>(b)
+         && std::get<2>(a) == std::get<2>(b);
 }
 
 inline bool