commit 2b4c947fc029efc1fe34715c3bd0b8d44cdcc04e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Aug 09 15:00:38 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 10 18:15:14 2012 -0700
tree 53b6e0b43ee5671e930bd7f836d2af6db69f0fdd
parent b8d14adbfd8bfdaf98982f06229c9534395cfc3a

Another set of refactoring

utils/load-stats-node.h

diff --git a/utils/load-stats-node.h b/utils/load-stats-node.h
index 5989a23..365db55 100644
--- a/utils/load-stats-node.h
+++ b/utils/load-stats-node.h
@@ -25,9 +25,10 @@
 #include <map>
 #include "ns3/ptr.h"
 
-namespace ns3
-{
-class NdnFace;
+namespace ns3 {
+namespace ndn {
+
+class Face;
 
 namespace ndnSIM
 {
@@ -37,7 +38,7 @@
 class LoadStatsNode
 {
 public:
-  typedef std::map< ns3::Ptr<ns3::NdnFace>, LoadStatsFace > stats_container;
+  typedef std::map< ns3::Ptr<Face>, LoadStatsFace > stats_container;
 
   LoadStatsNode () {}
   LoadStatsNode (const LoadStatsNode &) {}
@@ -55,13 +56,13 @@
    * Increment counter to incoming list
    */
   void
-  AddIncoming (ns3::Ptr<ns3::NdnFace> face);
+  AddIncoming (ns3::Ptr<Face> face);
 
   /**
    * Increment counter to outgoing list
    */
   void
-  AddOutgoing (ns3::Ptr<ns3::NdnFace> face);
+  AddOutgoing (ns3::Ptr<Face> face);
 
   /**
    * Increment counter to both incoming and outgoing lists, for all faces
@@ -79,13 +80,13 @@
    * Increment counter for Tx amount
    */
   void
-  Rx (ns3::Ptr<ns3::NdnFace> face, uint32_t amount);
+  Rx (ns3::Ptr<Face> face, uint32_t amount);
 
   /**
    * Increment counter for Tx amount
    */
   void
-  Tx (ns3::Ptr<ns3::NdnFace> face, uint32_t amount);
+  Tx (ns3::Ptr<Face> face, uint32_t amount);
 
   LoadStatsNode &
   operator += (const LoadStatsNode &stats);
@@ -119,7 +120,7 @@
   }
 
   void
-  RemoveFace (ns3::Ptr<ns3::NdnFace> face);
+  RemoveFace (ns3::Ptr<Face> face);
   
 private:
   LoadStatsFace   m_pit;
@@ -152,6 +153,7 @@
 operator << (std::ostream &os, const LoadStatsNode &node);
 
 } // ndnSIM
+} // ndn
 } // ns3
 
 #endif