model: Removing more legacy code and make code to compile
diff --git a/apps/ndn-app.cpp b/apps/ndn-app.cpp
index b5d3e35..4202111 100644
--- a/apps/ndn-app.cpp
+++ b/apps/ndn-app.cpp
@@ -24,9 +24,7 @@
#include "ns3/packet.h"
#include "ns3/ndn-l3-protocol.hpp"
-#include "ns3/ndn-fib.hpp"
#include "ns3/ndn-app-face.hpp"
-#include "ns3/ndn-forwarding-strategy.hpp"
NS_LOG_COMPONENT_DEFINE("ndn.App");
diff --git a/apps/ndn-app.hpp b/apps/ndn-app.hpp
index f0ac19b..7a3cfd7 100644
--- a/apps/ndn-app.hpp
+++ b/apps/ndn-app.hpp
@@ -98,19 +98,19 @@
protected:
bool m_active; ///< @brief Flag to indicate that application is active (set by StartApplication
/// and StopApplication)
- Ptr<Face> m_face; ///< @brief automatically created application face through which application
+ shared_ptr<Face> m_face; ///< @brief automatically created application face through which application
/// communicates
- TracedCallback<shared_ptr<const Interest>, Ptr<App>, Ptr<Face>>
+ TracedCallback<shared_ptr<const Interest>, Ptr<App>, shared_ptr<Face>>
m_receivedInterests; ///< @brief App-level trace of received Interests
- TracedCallbackshared_ptr<const Data>, Ptr<App>,
- Ptr<Face>> m_receivedDatas; ///< @brief App-level trace of received Data
+ TracedCallback<shared_ptr<const Data>, Ptr<App>,
+ shared_ptr<Face>> m_receivedDatas; ///< @brief App-level trace of received Data
- TracedCallback<shared_ptr<const Interest>, Ptr<App>, Ptr<Face>>
+ TracedCallback<shared_ptr<const Interest>, Ptr<App>, shared_ptr<Face>>
m_transmittedInterests; ///< @brief App-level trace of transmitted Interests
- TracedCallback<shared_ptr<const Data>, Ptr<App>, Ptr<Face>>
+ TracedCallback<shared_ptr<const Data>, Ptr<App>, shared_ptr<Face>>
m_transmittedDatas; ///< @brief App-level trace of transmitted Data
};