--- a/src/simulator/scheduler-heap.cc	Thu May 24 08:34:41 2007 +0200
+++ b/src/simulator/scheduler-heap.cc	Thu May 17 12:12:44 2007 -0500
@@ -139,11 +139,11 @@
 bool
 SchedulerHeap::IsLowerStrictly (Scheduler::EventKey const*a, Scheduler::EventKey const*b) const
 {
-  if (a->m_ns < b->m_ns)
+  if (a->m_ts < b->m_ts)
     {
       return true;
     }
-  else if (a->m_ns > b->m_ns)
+  else if (a->m_ts > b->m_ts)
     {
       return false;
     } 
@@ -227,7 +227,7 @@
 {
   m_heap.push_back (std::make_pair (event, key));
   BottomUp ();
-  return EventId (event, key.m_ns, key.m_uid);
+  return EventId (event, key.m_ts, key.m_uid);
 }
 
 EventImpl *
@@ -252,7 +252,7 @@
 EventImpl *
 SchedulerHeap::RealRemove (EventId id, Scheduler::EventKey *key)
 {
-  key->m_ns = id.GetNs ();
+  key->m_ts = id.GetTs ();
   key->m_uid = id.GetUid ();
   for (uint32_t i = 1; i < m_heap.size (); i++)
     {