--- a/src/simulator/scheduler-heap.h	Sat Sep 02 19:50:19 2006 +0200
+++ b/src/simulator/scheduler-heap.h	Sun Sep 03 12:24:04 2006 +0200
@@ -28,7 +28,6 @@
 
 namespace ns3 {
 
-class Event;
 class EventHolder;
 
 class SchedulerHeap : public Scheduler {
@@ -36,16 +35,17 @@
 	SchedulerHeap ();
 	virtual ~SchedulerHeap ();
 
-	virtual Event insert (Event event, Scheduler::EventKey key);
+	virtual EventId insert (EventImpl *event, Scheduler::EventKey key);
 	virtual bool is_empty (void) const;
-	virtual Event peek_next (void) const;
+	virtual EventImpl *peek_next (void) const;
 	virtual Scheduler::EventKey peek_next_key (void) const;
 	virtual void remove_next (void);
-	virtual Scheduler::EventKey remove (Event const ev);
+	virtual EventImpl *remove (EventId ev, Scheduler::EventKey *key);
+	virtual bool is_valid (EventId id);
 private:
-	typedef std::vector<std::pair<Event, Scheduler::EventKey> > BinaryHeap;
-	inline void store_in_event (Event ev, uint32_t index) const;
-	uint32_t get_from_event (Event const ev) const;
+	typedef std::vector<std::pair<EventImpl *, Scheduler::EventKey> > BinaryHeap;
+	inline void store_in_event (EventImpl *ev, uint32_t index) const;
+	uint32_t get_from_event (EventImpl *ev) const;
 
 	inline uint32_t parent (uint32_t id) const;
 	uint32_t sibling (uint32_t id) const;