commit eae83eec953324a6b5784d8ec8ca4fc711cd8a6a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 15:01:10 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Mar 15 15:17:26 2013 -0700
tree d7bb5dd16f01ea25ad24be309d1c7870e6ed7383
parent cfdc14fe6c996243299d594740d63a74afad101e

all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject

refs #29

utils/tracers/ndn-l3-aggregate-tracer.h

diff --git a/utils/tracers/ndn-l3-aggregate-tracer.h b/utils/tracers/ndn-l3-aggregate-tracer.h
index a04df67..c3f437b 100644
--- a/utils/tracers/ndn-l3-aggregate-tracer.h
+++ b/utils/tracers/ndn-l3-aggregate-tracer.h
@@ -83,39 +83,39 @@
 
   virtual void
   OutInterests  (std::string context,
-                 Ptr<const InterestHeader>, Ptr<const Face>);
+                 Ptr<const Interest>, Ptr<const Face>);
 
   virtual void
   InInterests   (std::string context,
-                 Ptr<const InterestHeader>, Ptr<const Face>);
+                 Ptr<const Interest>, Ptr<const Face>);
 
   virtual void
   DropInterests (std::string context,
-                 Ptr<const InterestHeader>, Ptr<const Face>);
+                 Ptr<const Interest>, Ptr<const Face>);
   
   virtual void
   OutNacks  (std::string context,
-             Ptr<const InterestHeader>, Ptr<const Face>);
+             Ptr<const Interest>, Ptr<const Face>);
 
   virtual void
   InNacks   (std::string context,
-             Ptr<const InterestHeader>, Ptr<const Face>);
+             Ptr<const Interest>, Ptr<const Face>);
 
   virtual void
   DropNacks (std::string context,
-             Ptr<const InterestHeader>, Ptr<const Face>);
+             Ptr<const Interest>, Ptr<const Face>);
   
   virtual void
   OutData  (std::string context,
-            Ptr<const ContentObjectHeader>, Ptr<const Packet>, bool fromCache, Ptr<const Face>);
+            Ptr<const ContentObject>, Ptr<const Packet>, bool fromCache, Ptr<const Face>);
 
   virtual void
   InData   (std::string context,
-            Ptr<const ContentObjectHeader>, Ptr<const Packet>, Ptr<const Face>);
+            Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>);
 
   virtual void
   DropData (std::string context,
-            Ptr<const ContentObjectHeader>, Ptr<const Packet>, Ptr<const Face>);
+            Ptr<const ContentObject>, Ptr<const Packet>, Ptr<const Face>);
 
 protected:
   void