[ViewVC] Diff of: cvs/libev/ev++.h

Comparing libev/ev++.h (file contents):
Revision 1.29 by llucax, Fri Jan 18 18:15:01 2008 UTC vs.
Revision 1.31 by root, Sat Jan 19 00:39:38 2008 UTC

 # include EV_H
 #else
 # include "ev.h"
 #endif
+#ifndef EV_CXX_EXCEPTIONS
+#define EV_CXX_EXCEPTIONS 1
+#endif
+#undef EV_THROW
+#if EV_CXX_EXCEPTIONS
+#  include <stdexcept>
+#  define EV_THROW(exception) throw (exception)
+#else
+#  define EV_THROW(exception)
+#endif
 namespace ev {
   typedef ev_tstamp tstamp;
   enum {
   {
     ONE = EVUNLOOP_ONE,
     ALL = EVUNLOOP_ALL
   };
+#if EV_CXX_EXCEPTIONS
+  struct bad_loop : std::runtime_error
+  {
+    bad_loop ()
+    : std::runtime_error ("loop can't be initialized")
+    {
+    }
+  };
+#endif
 #ifdef EV_AX
 #  undef EV_AX
 #endif
 #ifdef EV_AX_
   struct loop_ref
   {
     loop_ref (EV_P)
 #if EV_MULTIPLICITY
-      : EV_AX (EV_A)
+      EV_THROW (bad_loop) : EV_AX (EV_A)
 #endif
-    {
-    }
+    {
+#if EV_MULTIPLICIY && EV_CXX_EXCEPTIONS
+      if (!EV_A)
+        throw bad_loop ();
+#endif
+    }
-    bool operator== (const loop_ref &other) const
+    bool operator== (const loop_ref &other) const throw ()
     {
 #if EV_MULTIPLICITY
       return this->EV_AX == other.EV_AX;
 #else
       return true;
 #endif
     }
-    bool operator!= (const loop_ref &other) const
+    bool operator!= (const loop_ref &other) const throw ()
     {
 #if EV_MULTIPLICITY
       return ! (*this == other);
 #else
       return false;
 #endif
     }
 #if EV_MULTIPLICITY
-    bool operator== (struct ev_loop *other) const
+    bool operator== (struct ev_loop *other) const throw ()
     {
       return this->EV_AX == other;
     }
-    bool operator!= (struct ev_loop *other) const
+    bool operator!= (struct ev_loop *other) const throw ()
     {
       return ! (*this == other);
     }
-    bool operator== (const struct ev_loop *other) const
+    bool operator== (const struct ev_loop *other) const throw ()
     {
       return this->EV_AX == other;
     }
-    bool operator!= (const struct ev_loop *other) const
+    bool operator!= (const struct ev_loop *other) const throw ()
     {
       return (*this == other);
     }
-    operator struct ev_loop * () const
+    operator struct ev_loop * () const throw ()
     {
       return EV_AX;
     }
-    operator const struct ev_loop * () const
+    operator const struct ev_loop * () const throw ()
     {
       return EV_AX;
     }
-    bool is_default () const
+    bool is_default () const throw ()
     {
       return EV_AX == ev_default_loop (0);
     }
 #endif
     void loop (int flags = 0)
     {
       ev_loop (EV_AX_ flags);
     }
-    void unloop (how_t how = ONE)
+    void unloop (how_t how = ONE) throw ()
     {
       ev_unloop (EV_AX_ how);
     }
-    void post_fork ()
+    void post_fork () throw ()
     {
 #if EV_MULTIPLICITY
       ev_loop_fork (EV_AX);
 #else
       ev_default_fork ();
 #endif
     }
-    unsigned int count () const
+    unsigned int count () const throw ()
     {
       return ev_loop_count (EV_AX);
     }
-    unsigned int backend () const
+    unsigned int backend () const throw ()
     {
       return ev_backend (EV_AX);
     }
-    tstamp now () const
+    tstamp now () const throw ()
     {
       return ev_now (EV_AX);
     }
-    void ref ()
+    void ref () throw ()
     {
       ev_ref (EV_AX);
     }
-    void unref ()
+    void unref () throw ()
     {
       ev_unref (EV_AX);
     }
-    void set_io_collect_interval (tstamp interval)
+    void set_io_collect_interval (tstamp interval) throw ()
     {
       ev_set_io_collect_interval (EV_AX_ interval);
     }
-    void set_timeout_collect_interval (tstamp interval)
+    void set_timeout_collect_interval (tstamp interval) throw ()
     {
       ev_set_timeout_collect_interval (EV_AX_ interval);
     }
     // function callback
-    void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0)
+    void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) throw ()
     {
       ev_once (EV_AX_ fd, events, timeout, cb, arg);
     }
     // method callback
     template<class K, void (K::*method)(int)>
-    void once (int fd, int events, tstamp timeout, K *object)
+    void once (int fd, int events, tstamp timeout, K *object) throw ()
     {
       once (fd, events, timeout, method_thunk<K, method>, object);
     }
     template<class K, void (K::*method)(int)>
       (obj->*method) (revents);
     }
     // const method callback
     template<class K, void (K::*method)(int) const>
-    void once (int fd, int events, tstamp timeout, const K *object)
+    void once (int fd, int events, tstamp timeout, const K *object) throw ()
     {
       once (fd, events, timeout, const_method_thunk<K, method>, object);
     }
     template<class K, void (K::*method)(int) const>
       (obj->*method) (revents);
     }
     // simple method callback
     template<class K, void (K::*method)()>
-    void once (int fd, int events, tstamp timeout, K *object)
+    void once (int fd, int events, tstamp timeout, K *object) throw ()
     {
       once (fd, events, timeout, method_noargs_thunk<K, method>, object);
     }
     template<class K, void (K::*method)()>
       (obj->*method) ();
     }
     // simpler function callback
     template<void (*cb)(int)>
-    void once (int fd, int events, tstamp timeout)
+    void once (int fd, int events, tstamp timeout) throw ()
     {
       once (fd, events, timeout, simpler_func_thunk<cb>);
     }
     template<void (*cb)(int)>
       (*cb) (revents);
     }
     // simplest function callback
     template<void (*cb)()>
-    void once (int fd, int events, tstamp timeout)
+    void once (int fd, int events, tstamp timeout) throw ()
     {
       once (fd, events, timeout, simplest_func_thunk<cb>);
     }
     template<void (*cb)()>
     static void simplest_func_thunk (int revents, void* arg)
     {
       (*cb) ();
     }
-    void feed_fd_event (int fd, int revents)
+    void feed_fd_event (int fd, int revents) throw ()
     {
       ev_feed_fd_event (EV_AX_ fd, revents);
     }
-    void feed_signal_event (int signum)
+    void feed_signal_event (int signum) throw ()
     {
       ev_feed_signal_event (EV_AX_ signum);
     }
 #if EV_MULTIPLICITY
 #if EV_MULTIPLICITY
   struct dynamic_loop: loop_ref
   {
-    dynamic_loop (unsigned int flags = AUTO)
+    dynamic_loop (unsigned int flags = AUTO) EV_THROW (bad_loop)
       : loop_ref (ev_loop_new (flags))
     {
     }
-    ~dynamic_loop ()
+    ~dynamic_loop () throw ()
     {
       ev_loop_destroy (EV_AX);
       EV_AX = 0;
     }
 #endif
   struct default_loop: loop_ref
   {
-    default_loop (unsigned int flags = AUTO)
+    default_loop (unsigned int flags = AUTO) EV_THROW (bad_loop)
 #if EV_MULTIPLICITY
       : loop_ref (ev_default_loop (flags))
     {
     }
 #else
     {
+    #if EV_CXX_EXCEPTIONS
+      int r =
+    #endif
-      ev_default_loop (flags);
+          ev_default_loop (flags);
-    }
+    #if EV_CXX_EXCEPTIONS
+      if (!r)
+        throw bad_loop ();
-#endif
+    #endif
+    }
+#endif
-    ~default_loop ()
+    ~default_loop () throw ()
     {
       ev_default_destroy ();
 #if EV_MULTIPLICITY
       EV_AX = 0;
 #endif
     default_loop & operator= (const default_loop &);
   };
-  inline loop_ref get_default_loop ()
+  inline loop_ref get_default_loop () throw ()
   {
 #if EV_MULTIPLICITY
     return ev_default_loop (0);
 #else
     return loop_ref ();
   struct base : ev_watcher
   {
     #if EV_MULTIPLICITY
       EV_PX;
-      void set (EV_PX)
+      void set (EV_PX) throw ()
       {
         this->EV_A = EV_A;
       }
     #endif
-    base (EV_PX)
+    base (EV_PX) throw ()
     #if EV_MULTIPLICITY
       : EV_A (EV_A)
     #endif
     {
       ev_init (this, 0);
     }
-    void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents))
+    void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw ()
     {
       this->data = data;
       ev_set_cb (static_cast<ev_watcher *>(this), cb);
     }
     // method callback
     template<class K, void (K::*method)(watcher &w, int)>
-    void set (K *object)
+    void set (K *object) throw ()
     {
       set_ (object, method_thunk<K, method>);
     }
     template<class K, void (K::*method)(watcher &w, int)>
       (obj->*method) (*static_cast<watcher *>(w), revents);
     }
     // const method callback
     template<class K, void (K::*method)(watcher &w, int) const>
-    void set (const K *object)
+    void set (const K *object) throw ()
     {
       set_ (object, const_method_thunk<K, method>);
     }
     template<class K, void (K::*method)(watcher &w, int) const>
       (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents);
     }
     // function callback
     template<void (*function)(watcher &w, int)>
-    void set (void *data = 0)
+    void set (void *data = 0) throw ()
     {
       set_ (data, function_thunk<function>);
     }
     template<void (*function)(watcher &w, int)>
       function (*static_cast<watcher *>(w), revents);
     }
     // simple callback
     template<class K, void (K::*method)()>
-    void set (K *object)
+    void set (K *object) throw ()
     {
       set_ (object, method_noargs_thunk<K, method>);
     }
     template<class K, void (K::*method)()>
     {
       return ev_cb (static_cast<ev_watcher *>(this))
         (static_cast<ev_watcher *>(this), events);
     }
-    bool is_active () const
+    bool is_active () const throw ()
     {
       return ev_is_active (static_cast<const ev_watcher *>(this));
     }
-    bool is_pending () const
+    bool is_pending () const throw ()
     {
       return ev_is_pending (static_cast<const ev_watcher *>(this));
     }
-    void feed_event (int revents)
+    void feed_event (int revents) throw ()
     {
       ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
     }
   };
-  inline tstamp now ()
+  inline tstamp now () throw ()
   {
     return ev_time ();
   }
-  inline void delay (tstamp interval)
+  inline void delay (tstamp interval) throw ()
   {
     ev_sleep (interval);
   }
-  inline int version_major ()
+  inline int version_major () throw ()
   {
     return ev_version_major ();
   }
-  inline int version_minor ()
+  inline int version_minor () throw ()
   {
     return ev_version_minor ();
   }
-  inline unsigned int supported_backends ()
+  inline unsigned int supported_backends () throw ()
   {
     return ev_supported_backends ();
   }
-  inline unsigned int recommended_backends ()
+  inline unsigned int recommended_backends () throw ()
   {
     return ev_recommended_backends ();
   }
-  inline unsigned int embeddable_backends ()
+  inline unsigned int embeddable_backends () throw ()
   {
     return ev_embeddable_backends ();
   }
-  inline void set_allocator (void *(*cb)(void *ptr, long size))
+  inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
   {
     ev_set_allocator (cb);
   }
-  inline void set_syserr_cb (void (*cb)(const char *msg))
+  inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
   {
     ev_set_syserr_cb (cb);
   }
   #if EV_MULTIPLICITY
     #define EV_CONSTRUCT(cppstem,cstem)	                                                \
-      (EV_PX = get_default_loop ())                                                     \
+      (EV_PX = get_default_loop ()) throw ()                                         \
         : base<ev_ ## cstem, cppstem> (EV_A)                                            \
       {                                                                                 \
       }
   #else
     #define EV_CONSTRUCT(cppstem,cstem)                                                 \
-      ()                                                                                \
+      () throw ()                                                                    \
       {                                                                                 \
       }
   #endif
   /* using a template here would require quite a bit more lines,
    * so a macro solution was chosen */
   #define EV_BEGIN_WATCHER(cppstem,cstem)	                                        \
                                                                                         \
   struct cppstem : base<ev_ ## cstem, cppstem>                                          \
   {                                                                                     \
-    void start ()                                                                       \
+    void start () throw ()                                                           \
     {                                                                                   \
       ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this));                 \
     }                                                                                   \
                                                                                         \
-    void stop ()                                                                        \
+    void stop () throw ()                                                            \
     {                                                                                   \
       ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this));                  \
     }                                                                                   \
                                                                                         \
     cppstem EV_CONSTRUCT(cppstem,cstem)                                                 \
                                                                                         \
-    ~cppstem ()                                                                         \
+    ~cppstem () throw ()                                                             \
     {                                                                                   \
       stop ();                                                                          \
     }                                                                                   \
                                                                                         \
     using base<ev_ ## cstem, cppstem>::set;                                             \
   #define EV_END_WATCHER(cppstem,cstem)	                                                \
   };
   EV_BEGIN_WATCHER (io, io)
-    void set (int fd, int events)
+    void set (int fd, int events) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_io_set (static_cast<ev_io *>(this), fd, events);
       if (active) start ();
     }
-    void set (int events)
+    void set (int events) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_io_set (static_cast<ev_io *>(this), fd, events);
       if (active) start ();
     }
-    void start (int fd, int events)
+    void start (int fd, int events) throw ()
     {
       set (fd, events);
       start ();
     }
   EV_END_WATCHER (io, io)
   EV_BEGIN_WATCHER (timer, timer)
-    void set (ev_tstamp after, ev_tstamp repeat = 0.)
+    void set (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_timer_set (static_cast<ev_timer *>(this), after, repeat);
       if (active) start ();
     }
-    void start (ev_tstamp after, ev_tstamp repeat = 0.)
+    void start (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
     {
       set (after, repeat);
       start ();
     }
-    void again ()
+    void again () throw ()
     {
       ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
     }
   EV_END_WATCHER (timer, timer)
   #if EV_PERIODIC_ENABLE
   EV_BEGIN_WATCHER (periodic, periodic)
-    void set (ev_tstamp at, ev_tstamp interval = 0.)
+    void set (ev_tstamp at, ev_tstamp interval = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_periodic_set (static_cast<ev_periodic *>(this), at, interval, 0);
       if (active) start ();
     }
-    void start (ev_tstamp at, ev_tstamp interval = 0.)
+    void start (ev_tstamp at, ev_tstamp interval = 0.) throw ()
     {
       set (at, interval);
       start ();
     }
-    void again ()
+    void again () throw ()
     {
       ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
     }
   EV_END_WATCHER (periodic, periodic)
   #endif
   EV_BEGIN_WATCHER (sig, signal)
-    void set (int signum)
+    void set (int signum) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_signal_set (static_cast<ev_signal *>(this), signum);
       if (active) start ();
     }
-    void start (int signum)
+    void start (int signum) throw ()
     {
       set (signum);
       start ();
     }
   EV_END_WATCHER (sig, signal)
   EV_BEGIN_WATCHER (child, child)
-    void set (int pid)
+    void set (int pid) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_child_set (static_cast<ev_child *>(this), pid);
       if (active) start ();
     }
-    void start (int pid)
+    void start (int pid) throw ()
     {
       set (pid);
       start ();
     }
   EV_END_WATCHER (child, child)
   #if EV_STAT_ENABLE
   EV_BEGIN_WATCHER (stat, stat)
-    void set (const char *path, ev_tstamp interval = 0.)
+    void set (const char *path, ev_tstamp interval = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_stat_set (static_cast<ev_stat *>(this), path, interval);
       if (active) start ();
     }
-    void start (const char *path, ev_tstamp interval = 0.)
+    void start (const char *path, ev_tstamp interval = 0.) throw ()
     {
       stop ();
       set (path, interval);
       start ();
     }
-    void update ()
+    void update () throw ()
     {
       ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
     }
   EV_END_WATCHER (stat, stat)
   #endif
   EV_BEGIN_WATCHER (idle, idle)
-    void set () { }
+    void set () throw () { }
   EV_END_WATCHER (idle, idle)
   EV_BEGIN_WATCHER (prepare, prepare)
-    void set () { }
+    void set () throw () { }
   EV_END_WATCHER (prepare, prepare)
   EV_BEGIN_WATCHER (check, check)
-    void set () { }
+    void set () throw () { }
   EV_END_WATCHER (check, check)
   #if EV_EMBED_ENABLE
   EV_BEGIN_WATCHER (embed, embed)
-    void start (struct ev_loop *embedded_loop)
+    void start (struct ev_loop *embedded_loop) throw ()
     {
       stop ();
       ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
       start ();
     }
   EV_END_WATCHER (embed, embed)
   #endif
   #if EV_FORK_ENABLE
   EV_BEGIN_WATCHER (fork, fork)
-    void set () { }
+    void set () throw () { }
   EV_END_WATCHER (fork, fork)
   #endif
   #undef EV_PX
   #undef EV_PX_
   #undef EV_BEGIN_WATCHER
   #undef EV_END_WATCHER
 }
-#endif
+#undef EV_THROW
+#endif

Diff Legend

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

Comparing libev/ev++.h (file contents): Revision 1.29 by llucax, Fri Jan 18 18:15:01 2008 UTC vs. Revision 1.31 by root, Sat Jan 19 00:39:38 2008 UTC

Diff Legend

Comparing libev/ev++.h (file contents):
Revision 1.29 by llucax, Fri Jan 18 18:15:01 2008 UTC vs.
Revision 1.31 by root, Sat Jan 19 00:39:38 2008 UTC