ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev++.h
(Generate patch)

Comparing libev/ev++.h (file contents):
Revision 1.25 by llucax, Fri Jan 18 18:13:40 2008 UTC vs.
Revision 1.35 by llucax, Tue Jan 22 17:57:17 2008 UTC

… …
44# include EV_H 44# include EV_H
45#else 45#else
46# include "ev.h" 46# include "ev.h"
47#endif 47#endif
48 48
49#ifndef EV_USE_STDEXCEPT
50# define EV_USE_STDEXCEPT 1
51#endif
52
53#if EV_USE_STDEXCEPT
54# include <stdexcept>
55#endif
56
49namespace ev { 57namespace ev {
50 58
51 typedef ev_tstamp tstamp; 59 typedef ev_tstamp tstamp;
52 60
53 enum { 61 enum {
… …
91 { 99 {
92 ONE = EVUNLOOP_ONE, 100 ONE = EVUNLOOP_ONE,
93 ALL = EVUNLOOP_ALL 101 ALL = EVUNLOOP_ALL
94 }; 102 };
95 103
104 struct bad_loop
105#if EV_USE_STDEXCEPT
106 : std::runtime_error
107#endif
108 {
109#if EV_USE_STDEXCEPT
110 bad_loop ()
111 : std::runtime_error ("libev event loop cannot be initialized, bad value of LIBEV_FLAGS?")
112 {
113 }
114#endif
115 };
116
117#ifdef EV_AX
118# undef EV_AX
119#endif
120
121#ifdef EV_AX_
122# undef EV_AX_
123#endif
124
125#if EV_MULTIPLICITY
126# define EV_AX raw_loop
127# define EV_AX_ raw_loop,
128#else
129# define EV_AX
130# define EV_AX_
131#endif
132
133 struct loop_ref
134 {
135
136 loop_ref (EV_P)
137#if EV_MULTIPLICITY
138 throw (bad_loop) : EV_AX (EV_A)
139 {
140 if (!EV_AX)
141 throw bad_loop ();
142 }
143#else
144 throw ()
145 {
146 }
147#endif
148
149 bool operator == (const loop_ref &other) const throw ()
150 {
151#if EV_MULTIPLICITY
152 return EV_AX == other.EV_AX;
153#else
154 return true;
155#endif
156 }
157
158 bool operator != (const loop_ref &other) const throw ()
159 {
160#if EV_MULTIPLICITY
161 return ! (*this == other);
162#else
163 return false;
164#endif
165 }
166
167#if EV_MULTIPLICITY
168 bool operator== (struct ev_loop *other) const throw ()
169 {
170 return this->EV_AX == other;
171 }
172
173 bool operator!= (struct ev_loop *other) const throw ()
174 {
175 return ! (*this == other);
176 }
177
178 bool operator== (const struct ev_loop *other) const throw ()
179 {
180 return this->EV_AX == other;
181 }
182
183 bool operator!= (const struct ev_loop *other) const throw ()
184 {
185 return (*this == other);
186 }
187
188 operator struct ev_loop * () const throw ()
189 {
190 return EV_AX;
191 }
192
193 operator const struct ev_loop * () const throw ()
194 {
195 return EV_AX;
196 }
197
198 bool is_default () const throw ()
199 {
200 return EV_AX == ev_default_loop (0);
201 }
202#endif
203
204 void loop (int flags = 0)
205 {
206 ev_loop (EV_AX_ flags);
207 }
208
209 void unloop (how_t how = ONE) throw ()
210 {
211 ev_unloop (EV_AX_ how);
212 }
213
214 void post_fork () throw ()
215 {
216#if EV_MULTIPLICITY
217 ev_loop_fork (EV_AX);
218#else
219 ev_default_fork ();
220#endif
221 }
222
223 unsigned int count () const throw ()
224 {
225 return ev_loop_count (EV_AX);
226 }
227
228 unsigned int backend () const throw ()
229 {
230 return ev_backend (EV_AX);
231 }
232
233 tstamp now () const throw ()
234 {
235 return ev_now (EV_AX);
236 }
237
238 void ref () throw ()
239 {
240 ev_ref (EV_AX);
241 }
242
243 void unref () throw ()
244 {
245 ev_unref (EV_AX);
246 }
247
248 void set_io_collect_interval (tstamp interval) throw ()
249 {
250 ev_set_io_collect_interval (EV_AX_ interval);
251 }
252
253 void set_timeout_collect_interval (tstamp interval) throw ()
254 {
255 ev_set_timeout_collect_interval (EV_AX_ interval);
256 }
257
258 // function callback
259 void once (int fd, int events, tstamp timeout, void (*cb)(int, void *), void* arg = 0) throw ()
260 {
261 ev_once (EV_AX_ fd, events, timeout, cb, arg);
262 }
263
264 // method callback
265 template<class K, void (K::*method)(int)>
266 void once (int fd, int events, tstamp timeout, K *object) throw ()
267 {
268 once (fd, events, timeout, method_thunk<K, method>, object);
269 }
270
271 template<class K, void (K::*method)(int)>
272 static void method_thunk (int revents, void* arg)
273 {
274 K *obj = static_cast<K *>(arg);
275 (obj->*method) (revents);
276 }
277
278 // const method callback
279 template<class K, void (K::*method)(int) const>
280 void once (int fd, int events, tstamp timeout, const K *object) throw ()
281 {
282 once (fd, events, timeout, const_method_thunk<K, method>, object);
283 }
284
285 template<class K, void (K::*method)(int) const>
286 static void const_method_thunk (int revents, void* arg)
287 {
288 K *obj = static_cast<K *>(arg);
289 (obj->*method) (revents);
290 }
291
292 // simple method callback
293 template<class K, void (K::*method)()>
294 void once (int fd, int events, tstamp timeout, K *object) throw ()
295 {
296 once (fd, events, timeout, method_noargs_thunk<K, method>, object);
297 }
298
299 template<class K, void (K::*method)()>
300 static void method_noargs_thunk (int revents, void* arg)
301 {
302 K *obj = static_cast<K *>(arg);
303 (obj->*method) ();
304 }
305
306 // simpler function callback
307 template<void (*cb)(int)>
308 void once (int fd, int events, tstamp timeout) throw ()
309 {
310 once (fd, events, timeout, simpler_func_thunk<cb>);
311 }
312
313 template<void (*cb)(int)>
314 static void simpler_func_thunk (int revents, void* arg)
315 {
316 (*cb) (revents);
317 }
318
319 // simplest function callback
320 template<void (*cb)()>
321 void once (int fd, int events, tstamp timeout) throw ()
322 {
323 once (fd, events, timeout, simplest_func_thunk<cb>);
324 }
325
326 template<void (*cb)()>
327 static void simplest_func_thunk (int revents, void* arg)
328 {
329 (*cb) ();
330 }
331
332 void feed_fd_event (int fd, int revents) throw ()
333 {
334 ev_feed_fd_event (EV_AX_ fd, revents);
335 }
336
337 void feed_signal_event (int signum) throw ()
338 {
339 ev_feed_signal_event (EV_AX_ signum);
340 }
341
342#if EV_MULTIPLICITY
343 struct ev_loop* EV_AX;
344#endif
345
346 };
347
348#if EV_MULTIPLICITY
349 struct dynamic_loop: loop_ref
350 {
351
352 dynamic_loop (unsigned int flags = AUTO) throw (bad_loop)
353 : loop_ref (ev_loop_new (flags))
354 {
355 }
356
357 ~dynamic_loop () throw ()
358 {
359 ev_loop_destroy (EV_AX);
360 EV_AX = 0;
361 }
362
363 private:
364
365 dynamic_loop (const dynamic_loop &);
366
367 dynamic_loop & operator= (const dynamic_loop &);
368
369 };
370#endif
371
372 struct default_loop: loop_ref
373 {
374
375 default_loop (unsigned int flags = AUTO) throw (bad_loop)
376#if EV_MULTIPLICITY
377 : loop_ref (ev_default_loop (flags))
378#endif
379 {
380#if !EV_MULTIPLICITY
381 if (!ev_default_loop (flags))
382 throw bad_loop ();
383#endif
384 }
385
386 ~default_loop () throw ()
387 {
388 ev_default_destroy ();
389 }
390
391 private:
392 default_loop (const default_loop &);
393 default_loop &operator = (const default_loop &);
394 };
395
396 inline loop_ref get_default_loop () throw ()
397 {
398#if EV_MULTIPLICITY
399 return ev_default_loop (0);
400#else
401 return loop_ref ();
402#endif
403 }
404
405#undef EV_AX
406#undef EV_AX_
407
408#undef EV_PX
409#undef EV_PX_
410#if EV_MULTIPLICITY
411# define EV_PX loop_ref EV_A
412# define EV_PX_ loop_ref EV_A_
413#else
414# define EV_PX
415# define EV_PX_
416#endif
417
96 template<class ev_watcher, class watcher> 418 template<class ev_watcher, class watcher>
97 struct base : ev_watcher 419 struct base : ev_watcher
98 { 420 {
99 #if EV_MULTIPLICITY 421 #if EV_MULTIPLICITY
100 EV_P; 422 EV_PX;
101 423
102 void set (EV_P) 424 void set (EV_PX) throw ()
103 { 425 {
104 this->EV_A = EV_A; 426 this->EV_A = EV_A;
105 } 427 }
106 #endif 428 #endif
107 429
108 base () 430 base (EV_PX) throw ()
431 #if EV_MULTIPLICITY
432 : EV_A (EV_A)
433 #endif
109 { 434 {
110 ev_init (this, 0); 435 ev_init (this, 0);
111 } 436 }
112 437
113 void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) 438 void set_ (void *data, void (*cb)(EV_P_ ev_watcher *w, int revents)) throw ()
114 { 439 {
115 this->data = data; 440 this->data = data;
116 ev_set_cb (static_cast<ev_watcher *>(this), cb); 441 ev_set_cb (static_cast<ev_watcher *>(this), cb);
117 } 442 }
118 443
119 // method callback 444 // method callback
120 template<class K, void (K::*method)(watcher &w, int)> 445 template<class K, void (K::*method)(watcher &w, int)>
121 void set (K *object) 446 void set (K *object) throw ()
122 { 447 {
123 set_ (object, method_thunk<K, method>); 448 set_ (object, method_thunk<K, method>);
124 } 449 }
125 450
126 template<class K, void (K::*method)(watcher &w, int)> 451 template<class K, void (K::*method)(watcher &w, int)>
… …
130 (obj->*method) (*static_cast<watcher *>(w), revents); 455 (obj->*method) (*static_cast<watcher *>(w), revents);
131 } 456 }
132 457
133 // const method callback 458 // const method callback
134 template<class K, void (K::*method)(watcher &w, int) const> 459 template<class K, void (K::*method)(watcher &w, int) const>
135 void set (const K *object) 460 void set (const K *object) throw ()
136 { 461 {
137 set_ (object, const_method_thunk<K, method>); 462 set_ (object, const_method_thunk<K, method>);
138 } 463 }
139 464
140 template<class K, void (K::*method)(watcher &w, int) const> 465 template<class K, void (K::*method)(watcher &w, int) const>
… …
144 (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents); 469 (static_cast<K *>(w->data)->*method) (*static_cast<watcher *>(w), revents);
145 } 470 }
146 471
147 // function callback 472 // function callback
148 template<void (*function)(watcher &w, int)> 473 template<void (*function)(watcher &w, int)>
149 void set (void *data = 0) 474 void set (void *data = 0) throw ()
150 { 475 {
151 set_ (data, function_thunk<function>); 476 set_ (data, function_thunk<function>);
152 } 477 }
153 478
154 template<void (*function)(watcher &w, int)> 479 template<void (*function)(watcher &w, int)>
… …
157 function (*static_cast<watcher *>(w), revents); 482 function (*static_cast<watcher *>(w), revents);
158 } 483 }
159 484
160 // simple callback 485 // simple callback
161 template<class K, void (K::*method)()> 486 template<class K, void (K::*method)()>
162 void set (K *object) 487 void set (K *object) throw ()
163 { 488 {
164 set_ (object, method_noargs_thunk<K, method>); 489 set_ (object, method_noargs_thunk<K, method>);
165 } 490 }
166 491
167 template<class K, void (K::*method)()> 492 template<class K, void (K::*method)()>
… …
175 { 500 {
176 return ev_cb (static_cast<ev_watcher *>(this)) 501 return ev_cb (static_cast<ev_watcher *>(this))
177 (static_cast<ev_watcher *>(this), events); 502 (static_cast<ev_watcher *>(this), events);
178 } 503 }
179 504
180 bool is_active () const 505 bool is_active () const throw ()
181 { 506 {
182 return ev_is_active (static_cast<const ev_watcher *>(this)); 507 return ev_is_active (static_cast<const ev_watcher *>(this));
183 } 508 }
184 509
185 bool is_pending () const 510 bool is_pending () const throw ()
186 { 511 {
187 return ev_is_pending (static_cast<const ev_watcher *>(this)); 512 return ev_is_pending (static_cast<const ev_watcher *>(this));
188 } 513 }
514
515 void feed_event (int revents) throw ()
516 {
517 ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents);
518 }
519 };
520
521 inline tstamp now () throw ()
522 {
523 return ev_time ();
189 }; 524 }
190 525
191 526 inline void delay (tstamp interval) throw ()
192 inline ev_tstamp now (EV_P)
193 { 527 {
194 return ev_now (EV_A); 528 ev_sleep (interval);
529 }
530
531 inline int version_major () throw ()
532 {
533 return ev_version_major ();
534 }
535
536 inline int version_minor () throw ()
537 {
538 return ev_version_minor ();
539 }
540
541 inline unsigned int supported_backends () throw ()
542 {
543 return ev_supported_backends ();
544 }
545
546 inline unsigned int recommended_backends () throw ()
547 {
548 return ev_recommended_backends ();
549 }
550
551 inline unsigned int embeddable_backends () throw ()
552 {
553 return ev_embeddable_backends ();
554 }
555
556 inline void set_allocator (void *(*cb)(void *ptr, long size)) throw ()
557 {
558 ev_set_allocator (cb);
559 }
560
561 inline void set_syserr_cb (void (*cb)(const char *msg)) throw ()
562 {
563 ev_set_syserr_cb (cb);
195 } 564 }
196 565
197 #if EV_MULTIPLICITY 566 #if EV_MULTIPLICITY
198 #define EV_CONSTRUCT \ 567 #define EV_CONSTRUCT(cppstem,cstem) \
199 (EV_P = EV_DEFAULT) \ 568 (EV_PX = get_default_loop ()) throw () \
569 : base<ev_ ## cstem, cppstem> (EV_A) \
200 { \ 570 { \
201 set (EV_A); \
202 } 571 }
203 #else 572 #else
204 #define EV_CONSTRUCT \ 573 #define EV_CONSTRUCT(cppstem,cstem) \
205 () \ 574 () throw () \
206 { \ 575 { \
207 } 576 }
208 #endif 577 #endif
209 578
210 /* using a template here would require quite a bit more lines, 579 /* using a template here would require quite a bit more lines,
211 * so a macro solution was chosen */ 580 * so a macro solution was chosen */
212 #define EV_BEGIN_WATCHER(cppstem,cstem) \ 581 #define EV_BEGIN_WATCHER(cppstem,cstem) \
213 \ 582 \
214 struct cppstem : base<ev_ ## cstem, cppstem> \ 583 struct cppstem : base<ev_ ## cstem, cppstem> \
215 { \ 584 { \
216 void start () \ 585 void start () throw () \
217 { \ 586 { \
218 ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this)); \ 587 ev_ ## cstem ## _start (EV_A_ static_cast<ev_ ## cstem *>(this)); \
219 } \ 588 } \
220 \ 589 \
221 void stop () \ 590 void stop () throw () \
222 { \ 591 { \
223 ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this)); \ 592 ev_ ## cstem ## _stop (EV_A_ static_cast<ev_ ## cstem *>(this)); \
224 } \ 593 } \
225 \ 594 \
226 cppstem EV_CONSTRUCT \ 595 cppstem EV_CONSTRUCT(cppstem,cstem) \
227 \ 596 \
228 ~cppstem () \ 597 ~cppstem () throw () \
229 { \ 598 { \
230 stop (); \ 599 stop (); \
231 } \ 600 } \
232 \ 601 \
233 using base<ev_ ## cstem, cppstem>::set; \ 602 using base<ev_ ## cstem, cppstem>::set; \
… …
242 611
243 #define EV_END_WATCHER(cppstem,cstem) \ 612 #define EV_END_WATCHER(cppstem,cstem) \
244 }; 613 };
245 614
246 EV_BEGIN_WATCHER (io, io) 615 EV_BEGIN_WATCHER (io, io)
247 void set (int fd, int events) 616 void set (int fd, int events) throw ()
248 { 617 {
249 int active = is_active (); 618 int active = is_active ();
250 if (active) stop (); 619 if (active) stop ();
251 ev_io_set (static_cast<ev_io *>(this), fd, events); 620 ev_io_set (static_cast<ev_io *>(this), fd, events);
252 if (active) start (); 621 if (active) start ();
253 } 622 }
254 623
255 void set (int events) 624 void set (int events) throw ()
256 { 625 {
257 int active = is_active (); 626 int active = is_active ();
258 if (active) stop (); 627 if (active) stop ();
259 ev_io_set (static_cast<ev_io *>(this), fd, events); 628 ev_io_set (static_cast<ev_io *>(this), fd, events);
260 if (active) start (); 629 if (active) start ();
261 } 630 }
262 631
263 void start (int fd, int events) 632 void start (int fd, int events) throw ()
264 { 633 {
265 set (fd, events); 634 set (fd, events);
266 start (); 635 start ();
267 } 636 }
268 EV_END_WATCHER (io, io) 637 EV_END_WATCHER (io, io)
269 638
270 EV_BEGIN_WATCHER (timer, timer) 639 EV_BEGIN_WATCHER (timer, timer)
271 void set (ev_tstamp after, ev_tstamp repeat = 0.) 640 void set (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
272 { 641 {
273 int active = is_active (); 642 int active = is_active ();
274 if (active) stop (); 643 if (active) stop ();
275 ev_timer_set (static_cast<ev_timer *>(this), after, repeat); 644 ev_timer_set (static_cast<ev_timer *>(this), after, repeat);
276 if (active) start (); 645 if (active) start ();
277 } 646 }
278 647
279 void start (ev_tstamp after, ev_tstamp repeat = 0.) 648 void start (ev_tstamp after, ev_tstamp repeat = 0.) throw ()
280 { 649 {
281 set (after, repeat); 650 set (after, repeat);
282 start (); 651 start ();
283 } 652 }
284 653
285 void again () 654 void again () throw ()
286 { 655 {
287 ev_timer_again (EV_A_ static_cast<ev_timer *>(this)); 656 ev_timer_again (EV_A_ static_cast<ev_timer *>(this));
288 } 657 }
289 EV_END_WATCHER (timer, timer) 658 EV_END_WATCHER (timer, timer)
290 659
291 #if EV_PERIODIC_ENABLE 660 #if EV_PERIODIC_ENABLE
292 EV_BEGIN_WATCHER (periodic, periodic) 661 EV_BEGIN_WATCHER (periodic, periodic)
293 void set (ev_tstamp at, ev_tstamp interval = 0.) 662 void set (ev_tstamp at, ev_tstamp interval = 0.) throw ()
294 { 663 {
295 int active = is_active (); 664 int active = is_active ();
296 if (active) stop (); 665 if (active) stop ();
297 ev_periodic_set (static_cast<ev_periodic *>(this), at, interval, 0); 666 ev_periodic_set (static_cast<ev_periodic *>(this), at, interval, 0);
298 if (active) start (); 667 if (active) start ();
299 } 668 }
300 669
301 void start (ev_tstamp at, ev_tstamp interval = 0.) 670 void start (ev_tstamp at, ev_tstamp interval = 0.) throw ()
302 { 671 {
303 set (at, interval); 672 set (at, interval);
304 start (); 673 start ();
305 } 674 }
306 675
307 void again () 676 void again () throw ()
308 { 677 {
309 ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this)); 678 ev_periodic_again (EV_A_ static_cast<ev_periodic *>(this));
310 } 679 }
311 EV_END_WATCHER (periodic, periodic) 680 EV_END_WATCHER (periodic, periodic)
312 #endif 681 #endif
313 682
314 EV_BEGIN_WATCHER (sig, signal) 683 EV_BEGIN_WATCHER (sig, signal)
315 void set (int signum) 684 void set (int signum) throw ()
316 { 685 {
317 int active = is_active (); 686 int active = is_active ();
318 if (active) stop (); 687 if (active) stop ();
319 ev_signal_set (static_cast<ev_signal *>(this), signum); 688 ev_signal_set (static_cast<ev_signal *>(this), signum);
320 if (active) start (); 689 if (active) start ();
321 } 690 }
322 691
323 void start (int signum) 692 void start (int signum) throw ()
324 { 693 {
325 set (signum); 694 set (signum);
326 start (); 695 start ();
327 } 696 }
328 EV_END_WATCHER (sig, signal) 697 EV_END_WATCHER (sig, signal)
329 698
330 EV_BEGIN_WATCHER (child, child) 699 EV_BEGIN_WATCHER (child, child)
331 void set (int pid) 700 void set (int pid) throw ()
332 { 701 {
333 int active = is_active (); 702 int active = is_active ();
334 if (active) stop (); 703 if (active) stop ();
335 ev_child_set (static_cast<ev_child *>(this), pid); 704 ev_child_set (static_cast<ev_child *>(this), pid);
336 if (active) start (); 705 if (active) start ();
337 } 706 }
338 707
339 void start (int pid) 708 void start (int pid) throw ()
340 { 709 {
341 set (pid); 710 set (pid);
342 start (); 711 start ();
343 } 712 }
344 EV_END_WATCHER (child, child) 713 EV_END_WATCHER (child, child)
345 714
346 #if EV_STAT_ENABLE 715 #if EV_STAT_ENABLE
347 EV_BEGIN_WATCHER (stat, stat) 716 EV_BEGIN_WATCHER (stat, stat)
348 void set (const char *path, ev_tstamp interval = 0.) 717 void set (const char *path, ev_tstamp interval = 0.) throw ()
349 { 718 {
350 int active = is_active (); 719 int active = is_active ();
351 if (active) stop (); 720 if (active) stop ();
352 ev_stat_set (static_cast<ev_stat *>(this), path, interval); 721 ev_stat_set (static_cast<ev_stat *>(this), path, interval);
353 if (active) start (); 722 if (active) start ();
354 } 723 }
355 724
356 void start (const char *path, ev_tstamp interval = 0.) 725 void start (const char *path, ev_tstamp interval = 0.) throw ()
357 { 726 {
358 stop (); 727 stop ();
359 set (path, interval); 728 set (path, interval);
360 start (); 729 start ();
361 } 730 }
362 731
363 void update () 732 void update () throw ()
364 { 733 {
365 ev_stat_stat (EV_A_ static_cast<ev_stat *>(this)); 734 ev_stat_stat (EV_A_ static_cast<ev_stat *>(this));
366 } 735 }
367 EV_END_WATCHER (stat, stat) 736 EV_END_WATCHER (stat, stat)
368 #endif 737 #endif
369 738
370 EV_BEGIN_WATCHER (idle, idle) 739 EV_BEGIN_WATCHER (idle, idle)
371 void set () { } 740 void set () throw () { }
372 EV_END_WATCHER (idle, idle) 741 EV_END_WATCHER (idle, idle)
373 742
374 EV_BEGIN_WATCHER (prepare, prepare) 743 EV_BEGIN_WATCHER (prepare, prepare)
375 void set () { } 744 void set () throw () { }
376 EV_END_WATCHER (prepare, prepare) 745 EV_END_WATCHER (prepare, prepare)
377 746
378 EV_BEGIN_WATCHER (check, check) 747 EV_BEGIN_WATCHER (check, check)
379 void set () { } 748 void set () throw () { }
380 EV_END_WATCHER (check, check) 749 EV_END_WATCHER (check, check)
381 750
382 #if EV_EMBED_ENABLE 751 #if EV_EMBED_ENABLE
383 EV_BEGIN_WATCHER (embed, embed) 752 EV_BEGIN_WATCHER (embed, embed)
384 void start (struct ev_loop *embedded_loop) 753 void start (struct ev_loop *embedded_loop) throw ()
385 { 754 {
386 stop (); 755 stop ();
387 ev_embed_set (static_cast<ev_embed *>(this), embedded_loop); 756 ev_embed_set (static_cast<ev_embed *>(this), embedded_loop);
388 start (); 757 start ();
389 } 758 }
… …
395 EV_END_WATCHER (embed, embed) 764 EV_END_WATCHER (embed, embed)
396 #endif 765 #endif
397 766
398 #if EV_FORK_ENABLE 767 #if EV_FORK_ENABLE
399 EV_BEGIN_WATCHER (fork, fork) 768 EV_BEGIN_WATCHER (fork, fork)
400 void set () { } 769 void set () throw () { }
401 EV_END_WATCHER (fork, fork) 770 EV_END_WATCHER (fork, fork)
402 #endif 771 #endif
403 772
773 #undef EV_PX
774 #undef EV_PX_
404 #undef EV_CONSTRUCT 775 #undef EV_CONSTRUCT
405 #undef EV_BEGIN_WATCHER 776 #undef EV_BEGIN_WATCHER
406 #undef EV_END_WATCHER 777 #undef EV_END_WATCHER
778
407} 779}
408 780
409#endif 781#endif
410 782

Diff Legend

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