commit 53e922f39f2a4c817cefa710f73c4653a6848933
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Fri Oct 17 17:29:26 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 01 17:30:46 2015 -0800
tree 3060c710df5a84ebd2b7931ca7e7f3a248f4b441
parent 0b0942b74543354e85d5713215259aa3e7850ca6

ndnSIM-v2: Initial implementation

- Name, name::Components, Interest, Data now use ndn-cxx
- Ptr is replaced with shared_ptr for ndn-cxx structures

Credits for the change also to Mickey Sweat, Wentao Shang, and Alex Afanasyev

model/ndn-global-router.cpp

diff --git a/model/ndn-global-router.cpp b/model/ndn-global-router.cpp
index f44a088..19d5654 100644
--- a/model/ndn-global-router.cpp
+++ b/model/ndn-global-router.cpp
@@ -22,12 +22,9 @@
 
 #include "ns3/ndn-l3-protocol.hpp"
 #include "ns3/ndn-face.hpp"
-#include "ns3/ndn-name.hpp"
 
 #include "ns3/channel.h"
 
-using namespace boost;
-
 namespace ns3 {
 namespace ndn {
 
@@ -70,7 +67,7 @@
 }
 
 void
-GlobalRouter::AddLocalPrefix(Ptr<Name> prefix)
+GlobalRouter::AddLocalPrefix(shared_ptr<Name> prefix)
 {
   m_localPrefixes.push_back(prefix);
 }
@@ -78,7 +75,7 @@
 void
 GlobalRouter::AddIncidency(Ptr<Face> face, Ptr<GlobalRouter> gr)
 {
-  m_incidencies.push_back(make_tuple(this, face, gr));
+  m_incidencies.push_back(boost::make_tuple(this, face, gr));
 }
 
 GlobalRouter::IncidencyList&