commit da904f26bdc3d1e98b4cc2f53631230279b85a88
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Nov 05 16:23:33 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jan 06 18:39:06 2015 -0800
tree 0ace4490d028562ea0d839c35b8c2a5788f0c769
parent 89046c1e1980c27a87696af972dc027f3121dafc

utils: Fixes compilation of tracers

This commit also replaces use of boost::tuple with std::tuple and
boost::shared_ptr with std::shared_ptr

L3AggregateTracer is completely removed, as its functionality is
duplicated and extended by L3RateTracer

utils/tracers/ndn-l3-tracer.hpp

diff --git a/utils/tracers/ndn-l3-tracer.hpp b/utils/tracers/ndn-l3-tracer.hpp
index 4b2cc5a..2f3a3a7 100644
--- a/utils/tracers/ndn-l3-tracer.hpp
+++ b/utils/tracers/ndn-l3-tracer.hpp
@@ -22,15 +22,11 @@
 #define NDN_L3_TRACER_H
 
 #include "ns3/ndnSIM/model/ndn-common.hpp"
+#include "ns3/ndnSIM/model/ndn-face.hpp"
 
 #include "ns3/ptr.h"
 #include "ns3/simple-ref-count.h"
 
-/**
- * @ingroup ndn-helpers
- * @defgroup ndn-tracers Helpers to simplify metric collection
- */
-
 namespace ns3 {
 
 class Node;
@@ -38,12 +34,6 @@
 
 namespace ndn {
 
-namespace pit {
-class Entry;
-}
-
-class Face;
-
 /**
  * @ingroup ndn-tracers
  * @brief Base class for network-layer (incoming/outgoing Interests and Data) tracing of NDN stack
@@ -88,22 +78,22 @@
   Connect();
 
   virtual void
-  OutInterests(shared_ptr<const Interest>, shared_ptr<const Face>) = 0;
+  OutInterests(const Interest&, const Face&) = 0;
 
   virtual void
-  InInterests(shared_ptr<const Interest>, shared_ptr<const Face>) = 0;
+  InInterests(const Interest&, const Face&) = 0;
 
   virtual void
-  OutData(shared_ptr<const Data>, bool fromCache, shared_ptr<const Face>) = 0;
+  OutData(const Data&, const Face&) = 0;
 
   virtual void
-  InData(shared_ptr<const Data>, shared_ptr<const Face>) = 0;
+  InData(const Data&, const Face&) = 0;
 
-  virtual void
-  SatisfiedInterests(Ptr<const pit::Entry>) = 0;
+  // virtual void
+  // SatisfiedInterests(Ptr<const pit::Entry>) = 0;
 
-  virtual void
-  TimedOutInterests(Ptr<const pit::Entry>) = 0;
+  // virtual void
+  // TimedOutInterests(Ptr<const pit::Entry>) = 0;
 
 protected:
   std::string m_node;
@@ -117,21 +107,21 @@
       m_outInterests = 0;
       m_inData = 0;
       m_outData = 0;
-      m_satisfiedInterests = 0;
-      m_timedOutInterests = 0;
+      // m_satisfiedInterests = 0;
+      // m_timedOutInterests = 0;
 
-      m_outSatisfiedInterests = 0;
-      m_outTimedOutInterests = 0;
+      // m_outSatisfiedInterests = 0;
+      // m_outTimedOutInterests = 0;
     }
 
     double m_inInterests;
     double m_outInterests;
     double m_inData;
     double m_outData;
-    double m_satisfiedInterests;
-    double m_timedOutInterests;
-    double m_outSatisfiedInterests;
-    double m_outTimedOutInterests;
+    // double m_satisfiedInterests;
+    // double m_timedOutInterests;
+    // double m_outSatisfiedInterests;
+    // double m_outTimedOutInterests;
   };
 };