[ViewVC] Diff of: cvs/deliantra/server/include/cfperl.h

Comparing deliantra/server/include/cfperl.h (file contents):
Revision 1.36 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.38 by root, Sat Dec 16 03:08:26 2006 UTC

 #define ARG_MAP(o)    DT_MAP   , (void *)static_cast<maptile *>   (o)
 #define ARG_PLAYER(o) DT_PLAYER, (void *)static_cast<player *>    (o)
 #define ARG_ARCH(o)   DT_ARCH  , (void *)static_cast<archetype *> (o)
 #define ARG_PARTY(o)  DT_PARTY , (void *)static_cast<party *>     (o)
 #define ARG_REGION(o) DT_REGION, (void *)static_cast<region *>    (o)
-#define ARG_SOCKET(o) DT_SOCKET, (void *)static_cast<client_socket *> (o)
+#define ARG_SOCKET(o) DT_SOCKET, (void *)static_cast<client *> (o)
 // the ", ## __VA_ARGS" is, unfortunately, a gnu-cpp extension
 // all these return true when the normal event processing should be skipped (if any)
 #define INVOKE_(event, ...) cfperl_invoke (event, ## __VA_ARGS__, DT_END)
 private:
   void cancel  ()                           { GEventAPI->cancel  ((pe_watcher *)pe); } // private
 };
+struct iw : watcher<pe_idle>, callback<void (iw &)>
+{
+  template<class O, class M>
+  iw (O object, M method)
+  : callback<void (iw &)> (object, method)
+  {
+    alloc ();
+  }
+private:
+  void alloc ();
+};
 struct iow : watcher<pe_io>, callback<void (iow &, int)>
 {
   template<class O, class M>
   iow (O object, M method)
   : callback<void (iow &, int)> (object, method)
   {
     alloc ();
   }
-  iow &fd (int fd);
+  void fd (int fd);
   int poll ();
-  iow &poll (int events);
+  void poll (int events);
 private:
   void alloc ();
 };

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines