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

Comparing libev/ev++.h (file contents):
Revision 1.56 by root, Thu Oct 28 04:55:19 2010 UTC vs.
Revision 1.59 by root, Wed May 9 16:50:23 2012 UTC

4 * Copyright (c) 2007,2008,2010 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
284 } 284 }
285 285
286 template<class K, void (K::*method)(int)> 286 template<class K, void (K::*method)(int)>
287 static void method_thunk (int revents, void *arg) 287 static void method_thunk (int revents, void *arg)
288 { 288 {
289 static_cast<K *>(arg)->*method 289 (static_cast<K *>(arg)->*method)
290 (revents); 290 (revents);
291 } 291 }
292 292
293 // no-argument method callback 293 // no-argument method callback
294 template<class K, void (K::*method)()> 294 template<class K, void (K::*method)()>
298 } 298 }
299 299
300 template<class K, void (K::*method)()> 300 template<class K, void (K::*method)()>
301 static void method_noargs_thunk (int revents, void *arg) 301 static void method_noargs_thunk (int revents, void *arg)
302 { 302 {
303 static_cast<K *>(arg)->*method 303 (static_cast<K *>(arg)->*method)
304 (); 304 ();
305 } 305 }
306 306
307 // simpler function callback 307 // simpler function callback
308 template<void (*cb)(int)> 308 template<void (*cb)(int)>
511 return ev_is_pending (static_cast<const ev_watcher *>(this)); 511 return ev_is_pending (static_cast<const ev_watcher *>(this));
512 } 512 }
513 513
514 void feed_event (int revents) throw () 514 void feed_event (int revents) throw ()
515 { 515 {
516 ev_feed_event (EV_A_ static_cast<const ev_watcher *>(this), revents); 516 ev_feed_event (EV_A_ static_cast<ev_watcher *>(this), revents);
517 } 517 }
518 }; 518 };
519 519
520 inline tstamp now () throw () 520 inline tstamp now (EV_P) throw ()
521 { 521 {
522 return ev_time (); 522 return ev_now (EV_A);
523 } 523 }
524 524
525 inline void delay (tstamp interval) throw () 525 inline void delay (tstamp interval) throw ()
526 { 526 {
527 ev_sleep (interval); 527 ev_sleep (interval);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines