--- gvpe/src/iom.h	2003/03/26 01:58:46	1.5
+++ gvpe/src/iom.h	2003/03/28 05:40:54	1.7
@@ -41,11 +41,13 @@
   void idle_cb (tstamp &ts); time_watcher *idle;
 public:
 
+  void reschedule_time_watchers ();
+
   // register a watcher
   void reg (int fd, short events, io_watcher *w);
-  void unreg (const io_watcher *w);
+  void unreg (io_watcher *w);
   void reg (time_watcher *w);
-  void unreg (const time_watcher *w);
+  void unreg (time_watcher *w);
   
   void loop ();
 
@@ -104,12 +106,17 @@
     : callback<void, short>(object,method)
     { }
 
+  ~io_watcher ()
+    {
+      iom.unreg (this);
+    }
+
   void start (int fd, short events)
     {
       iom.reg (fd, events, this);
     }
 
-  void stop () const
+  void stop ()
     {
       iom.unreg (this);
     }
@@ -118,13 +125,20 @@
 #define TSTAMP_CANCEL -1.
 
 struct time_watcher : callback<void, tstamp &> {
+  bool registered; // already registered?
   tstamp at;
 
   template<class O1, class O2>
   time_watcher (O1 *object, void (O2::*method)(tstamp &))
     : callback<void, tstamp &>(object,method)
+    , registered(false)
     { }
 
+  ~time_watcher ()
+    {
+      iom.unreg (this);
+    }
+
   void set (tstamp when);
   void trigger ();
 
@@ -139,7 +153,7 @@
       set (when);
     }
 
-  void stop () const
+  void stop ()
     {
       iom.unreg (this);
     }