From 2b0181bd9344cf41f02c66f880e0481549be9f37 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Jun 2012 14:30:40 +0000 Subject: *** empty log message *** --- Changes | 2 ++ ev++.h | 2 +- ev.pod | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Changes b/Changes index 3eb5316..cf6e65e 100644 --- a/Changes +++ b/Changes @@ -38,6 +38,8 @@ TODO: ev_feed_child_event - try to detect signals around a fork faster (test program by Denis Bilenko). - work around recent glibc versions that leak memory in realloc. + - rename ev::embed::set to ev::embed::set_embed to avoid clashing + the watcher base set (loop) method. 4.11 Sat Feb 4 19:52:39 CET 2012 - INCOMPATIBLE CHANGE: ev_timer_again now clears the pending status, as diff --git a/ev++.h b/ev++.h index f6c0d25..ab7d0a6 100644 --- a/ev++.h +++ b/ev++.h @@ -764,7 +764,7 @@ namespace ev { #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 (); diff --git a/ev.pod b/ev.pod index db47f62..328f30f 100644 --- a/ev.pod +++ b/ev.pod @@ -4123,10 +4123,14 @@ do this when the watcher is inactive (and not pending either). =item w->set ([arguments]) -Basically the same as C, with the same arguments. Either this -method or a suitable start method must be called at least once. Unlike the -C counterpart, an active watcher gets automatically stopped and restarted -when reconfiguring it with this method. +Basically the same as C (except for C watchers>), +with the same arguments. Either this method or a suitable start method +must be called at least once. Unlike the C counterpart, an active watcher +gets automatically stopped and restarted when reconfiguring it with this +method. + +For C watchers this method is called C, to avoid +clashing with the C method. =item w->start () -- cgit v1.2.3