commit f034cbdb6e6c5b600f65e2a35ae2fc4aa6e5a6c9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 29 14:28:31 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 29 14:28:31 2012 -0700
tree c396fbfa95c4419f9b5d3538124eb78af3736c43
parent 3a4a0b3901b612b2e8931dc7a2724f2695330bf1

Initial redesign of internal data structures

model/ccnx-pit-entry.cc

diff --git a/model/ccnx-pit-entry.cc b/model/ccnx-pit-entry.cc
index 9c8c389..127b589 100644
--- a/model/ccnx-pit-entry.cc
+++ b/model/ccnx-pit-entry.cc
@@ -36,12 +36,10 @@
 
 CcnxPitEntry::CcnxPitEntry (Ptr<CcnxNameComponents> prefix,
                             const Time &expireTime,
-                            const CcnxFibEntry &fibEntry)
+                            CcnxFib::iterator fibEntry)
   : m_prefix (prefix)
   , m_fibEntry (fibEntry)
   , m_expireTime (Simulator::Now () + expireTime)
-  // , m_timerExpired (false)
-  // , m_counterExpirations (0)
   , m_maxRetxCount (0)
 {
 }
@@ -53,7 +51,6 @@
   m_expireTime = expireTime;
 }
 
-
 void
 CcnxPitEntry::UpdateLifetime (const Time &offsetTime)
 {
@@ -66,10 +63,10 @@
   NS_LOG_INFO ("Updated lifetime to " << m_expireTime.ToDouble (Time::S));
 }
 
-CcnxPitEntryIncomingFaceContainer::type::iterator
+CcnxPitEntry::in_iterator
 CcnxPitEntry::AddIncoming (Ptr<CcnxFace> face)
 {
-  std::pair<CcnxPitEntryIncomingFaceContainer::type::iterator,bool> ret = 
+  std::pair<in_iterator,bool> ret = 
     m_incoming.insert (CcnxPitEntryIncomingFace (face));
 
   NS_ASSERT_MSG (ret.second, "Something is wrong");
@@ -84,10 +81,10 @@
 }
 
 
-CcnxPitEntryOutgoingFaceContainer::type::iterator
+CcnxPitEntry::out_iterator
 CcnxPitEntry::AddOutgoing (Ptr<CcnxFace> face)
 {
-  std::pair<CcnxPitEntryOutgoingFaceContainer::type::iterator,bool> ret =
+  std::pair<out_iterator,bool> ret =
     m_outgoing.insert (CcnxPitEntryOutgoingFace (face));
 
   if (!ret.second)
@@ -102,13 +99,12 @@
 void
 CcnxPitEntry::RemoveAllReferencesToFace (Ptr<CcnxFace> face)
 {
-  CcnxPitEntryIncomingFaceContainer::type::iterator incoming =
-    m_incoming.find (face);
+  in_iterator incoming = m_incoming.find (face);
 
   if (incoming != m_incoming.end ())
     m_incoming.erase (incoming);
 
-  CcnxPitEntryOutgoingFaceContainer::type::iterator outgoing =
+  out_iterator outgoing =
     m_outgoing.find (face);
 
   if (outgoing != m_outgoing.end ())
@@ -116,7 +112,7 @@
 }
 
 void
-CcnxPitEntry::SetWaitingInVain (CcnxPitEntryOutgoingFaceContainer::type::iterator face)
+CcnxPitEntry::SetWaitingInVain (CcnxPitEntry::out_iterator face)
 {
   NS_LOG_DEBUG (boost::cref (*face->m_face));