commit 36b4577f73a6de0fb991af039ed77019803963f0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 10 16:57:42 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 10 16:57:42 2012 -0700
tree 4b2f5c8473d7ff85a494b635495974d03686012e
parent 30f60e3d4523cc020e07e33db694e1d3cfb94205

Checkpoint

model/ccnx-pit-impl.cc

diff --git a/model/ccnx-pit-impl.cc b/model/ccnx-pit-impl.cc
index 5e353a9..e5179d3 100644
--- a/model/ccnx-pit-impl.cc
+++ b/model/ccnx-pit-impl.cc
@@ -39,6 +39,21 @@
 
 NS_OBJECT_ENSURE_REGISTERED (CcnxPitImpl);
 
+
+// CcnxPitEntryImpl::CcnxPitEntryImpl (CcnxPit &pit,
+//                                     Ptr<const CcnxInterestHeader> header,
+//                                     Ptr<CcnxFibEntry> fibEntry)
+//   : CcnxPitEntry (pit, header, fibEntry)
+//   , item_ (0)
+// {
+//   static_cast<CcnxPitImpl&> (m_container).i_time.insert (*this);
+// }
+
+// CcnxPitEntryImpl::~CcnxPitEntryImpl ()
+// {
+//   static_cast<CcnxPitImpl&> (m_container).i_time.erase (*this);
+// }
+
 TypeId
 CcnxPitImpl::GetTypeId ()
 {
@@ -149,7 +164,7 @@
                  " Prefix = "<< header->GetName() << "NodeID == " << m_fib->GetObject<Node>()->GetId() << "\n" << *m_fib);
 
 
-  Ptr<CcnxPitEntryImpl> newEntry = ns3::Create<CcnxPitEntryImpl> (header, fibEntry);
+  Ptr< entry > newEntry = ns3::Create< entry > (boost::ref (*this), header, fibEntry);
   std::pair< super::iterator, bool > result = super::insert (header->GetName (), newEntry);
   if (result.first != super::end ())
     {
@@ -171,10 +186,10 @@
 
 
 void
-CcnxPitImpl::MarkErased (Ptr<CcnxPitEntry> entry)
+CcnxPitImpl::MarkErased (Ptr<CcnxPitEntry> item)
 {
   // entry->SetExpireTime (Simulator::Now () + m_PitEntryPruningTimout);
-  super::erase (StaticCast<CcnxPitEntryImpl> (entry)->to_iterator ());
+  super::erase (StaticCast< entry > (item)->to_iterator ());
 }
 
 
@@ -219,7 +234,7 @@
   if (from == 0) return 0;
   
   super::parent_trie::recursive_iterator
-    item (*StaticCast<CcnxPitEntryImpl> (from)->to_iterator ()),
+    item (*StaticCast< entry > (from)->to_iterator ()),
     end (0);
   
   for (item++; item != end; item++)