X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/c12d1228a8089ed701ce994c8e2d9858d906a29d..84324dcdf24f2119a243908f3c77c9cad3c80b99:/ev%20%20.h/software/libev.git/blobdiff_plain/c12d1228a8089ed701ce994c8e2d9858d906a29d..84324dcdf24f2119a243908f3c77c9cad3c80b99:/ev++.h

diff --git a/ev++.h b/ev++.h
index f62aac4..8b1f936 100644
--- a/ev++.h
+++ b/ev++.h
@@ -46,16 +46,12 @@
 # include "ev.h"
 #endif
 
-#ifndef EV_CXX_EXCEPTIONS
-#define EV_CXX_EXCEPTIONS 1
+#ifndef EV_USE_STDEXCEPT
+# define EV_USE_STDEXCEPT 1
 #endif
 
-#undef EV_THROW
-#if EV_CXX_EXCEPTIONS
-#  include <stdexcept>
-#  define EV_THROW(exception) throw (exception)
-#else
-#  define EV_THROW(exception)
+#if EV_USE_STDEXCEPT
+# include <stdexcept>
 #endif
 
 namespace ev {
@@ -105,13 +101,18 @@ namespace ev {
     ALL = EVUNLOOP_ALL
   };
 
-#if EV_CXX_EXCEPTIONS
-  struct bad_loop: std::runtime_error
+  struct bad_loop
+#if EV_USE_STDEXCEPT
+  : std::runtime_error
+#endif
   {
-    bad_loop()
-      : std::runtime_error("loop can't be initialized") {}
-  };
+#if EV_USE_STDEXCEPT
+    bad_loop ()
+    : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?")
+    {
+    }
 #endif
+  };
 
 #ifdef EV_AX
 #  undef EV_AX
@@ -132,27 +133,27 @@ namespace ev {
   struct loop_ref
   {
 
-    loop_ref (EV_P)
+    loop_ref (EV_P) throw (bad_loop)
 #if EV_MULTIPLICITY
-      EV_THROW (bad_loop) : EV_AX (EV_A)
+    : EV_AX (EV_A)
 #endif
     {
-#if EV_MULTIPLICIY && EV_CXX_EXCEPTIONS
-      if (!EV_A)
+#if EV_MULTIPLICITY
+      if (!EV_AX)
         throw bad_loop ();
 #endif
     }
 
-    bool operator== (const loop_ref &other) const EV_THROW ()
+    bool operator == (const loop_ref &other) const throw ()
     {
 #if EV_MULTIPLICITY
-      return this->EV_AX == other.EV_AX;
+      return EV_AX == other.EV_AX;
 #else
       return true;
 #endif
     }
 
-    bool operator!= (const loop_ref &other) const EV_THROW ()
+    bool operator != (const loop_ref &other) const throw ()
     {
 #if EV_MULTIPLICITY
       return ! (*this == other);
@@ -162,37 +163,37 @@ namespace ev {
     }
 
 #if EV_MULTIPLICITY
-    bool operator== (struct ev_loop *other) const EV_THROW ()
+    bool operator== (struct ev_loop *other) const throw ()
     {
       return this->EV_AX == other;
     }
 
-    bool operator!= (struct ev_loop *other) const EV_THROW ()
+    bool operator!= (struct ev_loop *other) const throw ()
     {
       return ! (*this == other);
     }
 
-    bool operator== (const struct ev_loop *other) const EV_THROW ()
+    bool operator== (const struct ev_loop *other) const throw ()
     {
       return this->EV_AX == other;
     }
 
-    bool operator!= (const struct ev_loop *other) const EV_THROW ()
+    bool operator!= (const struct ev_loop *other) const throw ()
     {
       return (*this == other);
     }
 
-    operator struct ev_loop * () const EV_THROW ()
+    operator struct ev_loop * () const throw ()
     {
       return EV_AX;
     }
 
-    operator const struct ev_loop * () const EV_THROW ()
+    operator const struct ev_loop * () const throw ()
     {
       return EV_AX;
     }
 
-    bool is_default () const EV_THROW ()
+    bool is_default () const throw ()
     {
       return EV_AX == ev_default_loop (0);
     }
@@ -203,12 +204,12 @@ namespace ev {
       ev_loop (EV_AX_ flags);
     }
 
-    void unloop (how_t how = ONE) EV_THROW ()
+    void unloop (how_t how = ONE) throw ()
     {
       ev_unloop (EV_AX_ how);
     }
 
-    void post_fork () EV_THROW ()
+    void post_fork () throw ()
     {
 #if EV_MULTIPLICITY
       ev_loop_fork (EV_AX);
@@ -217,50 +218,50 @@ namespace ev {
 #endif
     }
 
-    unsigned int count () const EV_THROW ()
+    unsigned int count () const throw ()
     {
       return ev_loop_count (EV_AX);
     }
 
-    unsigned int backend () const EV_THROW ()
+    unsigned int backend () const throw ()
     {
       return ev_backend (EV_AX);
     }
 
-    tstamp now () const EV_THROW ()
+    tstamp now () const throw ()
     {
       return ev_now (EV_AX);
     }
 
-    void ref () EV_THROW ()
+    void ref () throw ()
     {
       ev_ref (EV_AX);
     }
 
-    void unref () EV_THROW ()
+    void unref () throw ()
     {
       ev_unref (EV_AX);
     }
 
-    void set_io_collect_interval (tstamp interval) EV_THROW ()
+    void set_io_collect_interval (tstamp interval) throw ()
     {
       ev_set_io_collect_interval (EV_AX_ interval);
     }
 
-    void set_timeout_collect_interval (tstamp interval) EV_THROW ()
+    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) EV_THROW ()
+    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) EV_THROW ()
+    void once (int fd, int events, tstamp timeout, K *object) throw ()
     {
       once (fd, events, timeout, method_thunk<K, method>, object);
     }
@@ -274,7 +275,7 @@ namespace ev {
 
     // const method callback
     template<class K, void (K::*method)(int) const>
-    void once (int fd, int events, tstamp timeout, const K *object) EV_THROW ()
+    void once (int fd, int events, tstamp timeout, const K *object) throw ()
     {
       once (fd, events, timeout, const_method_thunk<K, method>, object);
     }
@@ -288,7 +289,7 @@ namespace ev {
 
     // simple method callback
     template<class K, void (K::*method)()>
-    void once (int fd, int events, tstamp timeout, K *object) EV_THROW ()
+    void once (int fd, int events, tstamp timeout, K *object) throw ()
     {
       once (fd, events, timeout, method_noargs_thunk<K, method>, object);
     }
@@ -302,7 +303,7 @@ namespace ev {
 
     // simpler function callback
     template<void (*cb)(int)>
-    void once (int fd, int events, tstamp timeout) EV_THROW ()
+    void once (int fd, int events, tstamp timeout) throw ()
     {
       once (fd, events, timeout, simpler_func_thunk<cb>);
     }
@@ -315,7 +316,7 @@ namespace ev {
 
     // simplest function callback
     template<void (*cb)()>
-    void once (int fd, int events, tstamp timeout) EV_THROW ()
+    void once (int fd, int events, tstamp timeout) throw ()
     {
       once (fd, events, timeout, simplest_func_thunk<cb>);
     }
@@ -326,12 +327,12 @@ namespace ev {
       (*cb) ();
     }
 
-    void feed_fd_event (int fd, int revents) EV_THROW ()
+    void feed_fd_event (int fd, int revents) throw ()
     {
       ev_feed_fd_event (EV_AX_ fd, revents);
     }
 
-    void feed_signal_event (int signum) EV_THROW ()
+    void feed_signal_event (int signum) throw ()
     {
       ev_feed_signal_event (EV_AX_ signum);
     }
@@ -351,7 +352,7 @@ namespace ev {
     {
     }
 
-    ~dynamic_loop () EV_THROW ()
+    ~dynamic_loop () throw ()
     {
       ev_loop_destroy (EV_AX);
       EV_AX = 0;
@@ -369,41 +370,28 @@ namespace ev {
   struct default_loop: loop_ref
   {
 
-    default_loop (unsigned int flags = AUTO) EV_THROW (bad_loop)
+    default_loop (unsigned int flags = AUTO) throw (bad_loop)
 #if EV_MULTIPLICITY
-      : loop_ref (ev_default_loop (flags))
-    {
-    }
-#else
+    : loop_ref (ev_default_loop (flags))
+#endif
     {
-    #if EV_CXX_EXCEPTIONS
-      int r =
-    #endif
-          ev_default_loop (flags);
-    #if EV_CXX_EXCEPTIONS
-      if (!r)
-        throw bad_loop ();
-    #endif
-    }
+#ifndef EV_MULTIPLICITY
+    if (!ev_default_loop (flags))
+      throw bad_loop ();
 #endif
+    }
 
-    ~default_loop () EV_THROW ()
+    ~default_loop () throw ()
     {
       ev_default_destroy ();
-#if EV_MULTIPLICITY
-      EV_AX = 0;
-#endif
     }
 
   private:
-
     default_loop (const default_loop &);
-
-    default_loop & operator= (const default_loop &);
-
+    default_loop &operator = (const default_loop &);
   };
 
-  inline loop_ref get_default_loop () EV_THROW ()
+  inline loop_ref get_default_loop () throw ()
   {
 #if EV_MULTIPLICITY
     return ev_default_loop (0);
@@ -431,13 +419,13 @@ namespace ev {
     #if EV_MULTIPLICITY
       EV_PX;
 
-      void set (EV_PX) EV_THROW ()
+      void set (EV_PX) throw ()
       {
         this->EV_A = EV_A;
       }
     #endif
 
-    base (EV_PX) EV_THROW ()
+    base (EV_PX) throw ()
     #if EV_MULTIPLICITY
       : EV_A (EV_A)
     #endif
@@ -445,7 +433,7 @@ namespace ev {
       ev_init (this, 0);
     }
 
-    void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) EV_THROW ()
+    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);
@@ -453,7 +441,7 @@ namespace ev {
 
     // method callback
     template<class K, void (K::*method)(watcher &w, int)>
-    void set (K *object) EV_THROW ()
+    void set (K *object) throw ()
     {
       set_ (object, method_thunk<K, method>);
     }
@@ -467,7 +455,7 @@ namespace ev {
 
     // const method callback
     template<class K, void (K::*method)(watcher &w, int) const>
-    void set (const K *object) EV_THROW ()
+    void set (const K *object) throw ()
     {
       set_ (object, const_method_thunk<K, method>);
     }
@@ -481,7 +469,7 @@ namespace ev {
 
     // function callback
     template<void (*function)(watcher &w, int)>
-    void set (void *data = 0) EV_THROW ()
+    void set (void *data = 0) throw ()
     {
       set_ (data, function_thunk<function>);
     }
@@ -494,7 +482,7 @@ namespace ev {
 
     // simple callback
     template<class K, void (K::*method)()>
-    void set (K *object) EV_THROW ()
+    void set (K *object) throw ()
     {
       set_ (object, method_noargs_thunk<K, method>);
     }
@@ -512,76 +500,76 @@ namespace ev {
         (static_cast<ev_watcher *>(this), events);
     }
 
-    bool is_active () const EV_THROW ()
+    bool is_active () const throw ()
     {
       return ev_is_active (static_cast<const ev_watcher *>(this));
     }
 
-    bool is_pending () const EV_THROW ()
+    bool is_pending () const throw ()
     {
       return ev_is_pending (static_cast<const ev_watcher *>(this));
     }
 
-    void feed_event (int revents) EV_THROW ()
+    void feed_event (int revents) throw ()
     {
       ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
     }
   };
 
-  inline tstamp now () EV_THROW ()
+  inline tstamp now () throw ()
   {
     return ev_time ();
   }
 
-  inline void delay (tstamp interval) EV_THROW ()
+  inline void delay (tstamp interval) throw ()
   {
     ev_sleep (interval);
   }
 
-  inline int version_major () EV_THROW ()
+  inline int version_major () throw ()
   {
     return ev_version_major ();
   }
 
-  inline int version_minor () EV_THROW ()
+  inline int version_minor () throw ()
   {
     return ev_version_minor ();
   }
 
-  inline unsigned int supported_backends () EV_THROW ()
+  inline unsigned int supported_backends () throw ()
   {
     return ev_supported_backends ();
   }
 
-  inline unsigned int recommended_backends () EV_THROW ()
+  inline unsigned int recommended_backends () throw ()
   {
     return ev_recommended_backends ();
   }
 
-  inline unsigned int embeddable_backends () EV_THROW ()
+  inline unsigned int embeddable_backends () throw ()
   {
     return ev_embeddable_backends ();
   }
 
-  inline void set_allocator (void *(*cb)(void *ptr, long size)) EV_THROW ()
+  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)) EV_THROW ()
+  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_THROW ()                                         \
+      (EV_PX = get_default_loop ()) throw ()                                         \
         : base<ev_ ## cstem, cppstem> (EV_A)                                            \
       {                                                                                 \
       }
   #else
     #define EV_CONSTRUCT(cppstem,cstem)                                                 \
-      () EV_THROW ()                                                                    \
+      () throw ()                                                                    \
       {                                                                                 \
       }
   #endif
@@ -592,19 +580,19 @@ namespace ev {
                                                                                         \
   struct cppstem : base<ev_ ## cstem, cppstem>                                          \
   {                                                                                     \
-    void start () EV_THROW ()                                                           \
+    void start () throw ()                                                           \
     {                                                                                   \
       ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this));                 \
     }                                                                                   \
                                                                                         \
-    void stop () EV_THROW ()                                                            \
+    void stop () throw ()                                                            \
     {                                                                                   \
       ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this));                  \
     }                                                                                   \
                                                                                         \
     cppstem EV_CONSTRUCT(cppstem,cstem)                                                 \
                                                                                         \
-    ~cppstem () EV_THROW ()                                                             \
+    ~cppstem () throw ()                                                             \
     {                                                                                   \
       stop ();                                                                          \
     }                                                                                   \
@@ -623,7 +611,7 @@ namespace ev {
   };
 
   EV_BEGIN_WATCHER (io, io)
-    void set (int fd, int events) EV_THROW ()
+    void set (int fd, int events) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -631,7 +619,7 @@ namespace ev {
       if (active) start ();
     }
 
-    void set (int events) EV_THROW ()
+    void set (int events) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -639,7 +627,7 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (int fd, int events) EV_THROW ()
+    void start (int fd, int events) throw ()
     {
       set (fd, events);
       start ();
@@ -647,7 +635,7 @@ namespace ev {
   EV_END_WATCHER (io, io)
 
   EV_BEGIN_WATCHER (timer, timer)
-    void set (ev_tstamp after, ev_tstamp repeat = 0.) EV_THROW ()
+    void set (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -655,13 +643,13 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (ev_tstamp after, ev_tstamp repeat = 0.) EV_THROW ()
+    void start (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
     {
       set (after, repeat);
       start ();
     }
 
-    void again () EV_THROW ()
+    void again () throw ()
     {
       ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
     }
@@ -669,7 +657,7 @@ namespace ev {
 
   #if EV_PERIODIC_ENABLE
   EV_BEGIN_WATCHER (periodic, periodic)
-    void set (ev_tstamp at, ev_tstamp interval = 0.) EV_THROW ()
+    void set (ev_tstamp at, ev_tstamp interval = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -677,13 +665,13 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (ev_tstamp at, ev_tstamp interval = 0.) EV_THROW ()
+    void start (ev_tstamp at, ev_tstamp interval = 0.) throw ()
     {
       set (at, interval);
       start ();
     }
 
-    void again () EV_THROW ()
+    void again () throw ()
     {
       ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
     }
@@ -691,7 +679,7 @@ namespace ev {
   #endif
 
   EV_BEGIN_WATCHER (sig, signal)
-    void set (int signum) EV_THROW ()
+    void set (int signum) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -699,7 +687,7 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (int signum) EV_THROW ()
+    void start (int signum) throw ()
     {
       set (signum);
       start ();
@@ -707,7 +695,7 @@ namespace ev {
   EV_END_WATCHER (sig, signal)
 
   EV_BEGIN_WATCHER (child, child)
-    void set (int pid) EV_THROW ()
+    void set (int pid) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -715,7 +703,7 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (int pid) EV_THROW ()
+    void start (int pid) throw ()
     {
       set (pid);
       start ();
@@ -724,7 +712,7 @@ namespace ev {
 
   #if EV_STAT_ENABLE
   EV_BEGIN_WATCHER (stat, stat)
-    void set (const char *path, ev_tstamp interval = 0.) EV_THROW ()
+    void set (const char *path, ev_tstamp interval = 0.) throw ()
     {
       int active = is_active ();
       if (active) stop ();
@@ -732,14 +720,14 @@ namespace ev {
       if (active) start ();
     }
 
-    void start (const char *path, ev_tstamp interval = 0.) EV_THROW ()
+    void start (const char *path, ev_tstamp interval = 0.) throw ()
     {
       stop ();
       set (path, interval);
       start ();
     }
 
-    void update () EV_THROW ()
+    void update () throw ()
     {
       ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
     }
@@ -747,20 +735,20 @@ namespace ev {
   #endif
 
   EV_BEGIN_WATCHER (idle, idle)
-    void set () EV_THROW () { }
+    void set () throw () { }
   EV_END_WATCHER (idle, idle)
 
   EV_BEGIN_WATCHER (prepare, prepare)
-    void set () EV_THROW () { }
+    void set () throw () { }
   EV_END_WATCHER (prepare, prepare)
 
   EV_BEGIN_WATCHER (check, check)
-    void set () EV_THROW () { }
+    void set () throw () { }
   EV_END_WATCHER (check, check)
 
   #if EV_EMBED_ENABLE
   EV_BEGIN_WATCHER (embed, embed)
-    void start (struct ev_loop *embedded_loop) EV_THROW ()
+    void start (struct ev_loop *embedded_loop) throw ()
     {
       stop ();
       ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
@@ -776,7 +764,7 @@ namespace ev {
 
   #if EV_FORK_ENABLE
   EV_BEGIN_WATCHER (fork, fork)
-    void set () EV_THROW () { }
+    void set () throw () { }
   EV_END_WATCHER (fork, fork)
   #endif