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
diff --git a/apps/ndn-consumer-zipf-mandelbrot.cpp b/apps/ndn-consumer-zipf-mandelbrot.cpp
index 806b8e3..f6037e3 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cpp
+++ b/apps/ndn-consumer-zipf-mandelbrot.cpp
@@ -21,8 +21,6 @@
#include "ndn-consumer-zipf-mandelbrot.hpp"
#include "ns3/ndn-app-face.hpp"
-#include "ns3/ndn-interest.hpp"
-#include "ns3/ndn-data.hpp"
#include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.hpp"
@@ -171,11 +169,11 @@
// std::cout << Simulator::Now ().ToDouble (Time::S) << "s -> " << seq << "\n";
//
- Ptr<Name> nameWithSequence = Create<Name>(m_interestName);
+ shared_ptr<Name> nameWithSequence = make_shared<Name>(m_interestName);
nameWithSequence->appendSeqNum(seq);
//
- Ptr<Interest> interest = Create<Interest>();
+ shared_ptr<Interest> interest = make_shared<Interest>();
interest->SetNonce(m_rand.GetValue());
interest->SetName(nameWithSequence);