ext/libev/ev++.h in passenger-4.0.20 vs ext/libev/ev++.h in passenger-4.0.21

@@ -284,11 +284,11 @@
     }
 
     template<class K, void (K::*method)(int)>
     static void method_thunk (int revents, void *arg)
     {
-      static_cast<K *>(arg)->*method
+      (static_cast<K *>(arg)->*method)
         (revents);
     }
 
     // no-argument method callback
     template<class K, void (K::*method)()>
@@ -298,11 +298,11 @@
     }
 
     template<class K, void (K::*method)()>
     static void method_noargs_thunk (int revents, void *arg)
     {
-      static_cast<K *>(arg)->*method
+      (static_cast<K *>(arg)->*method)
         ();
     }
 
     // simpler function callback
     template<void (*cb)(int)>
@@ -511,11 +511,11 @@
       return ev_is_pending (static_cast<const ev_watcher *>(this));
     }
 
     void feed_event (int revents) throw ()
     {
-      ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
+      ev_feed_event (EV_A_ static_cast<ev_watcher *>(this), revents);
     }
   };
 
   inline tstamp now (EV_P) throw ()
   {
@@ -550,16 +550,16 @@
   inline unsigned int embeddable_backends () throw ()
   {
     return ev_embeddable_backends ();
   }
 
-  inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
+  inline void set_allocator (void *(*cb)(void *ptr, long size) throw ()) throw ()
   {
     ev_set_allocator (cb);
   }
 
-  inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
+  inline void set_syserr_cb (void (*cb)(const char *msg) throw ()) throw ()
   {
     ev_set_syserr_cb (cb);
   }
 
   #if EV_MULTIPLICITY
@@ -762,10 +762,10 @@
   EV_END_WATCHER (check, check)
   #endif
 
   #if EV_EMBED_ENABLE
   EV_BEGIN_WATCHER (embed, embed)
-    void set (struct ev_loop *embedded_loop) throw ()
+    void set_embed (struct ev_loop *embedded_loop) throw ()
     {
       int active = is_active ();
       if (active) stop ();
       ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
       if (active) start ();