X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpoll.cpp;fp=source%2Fio%2Fpoll.cpp;h=9697ebfc3aa2094225325ea0aebcadb75d19953d;hp=1ca0987ac10fd0ce7795f5649f667ffc6f178c42;hb=c21ab7e49852585df01b4cc19599e25a918b581b;hpb=31e72f50fbb34d86877e5110401c49ce3fefd4bb diff --git a/source/io/poll.cpp b/source/io/poll.cpp index 1ca0987..9697ebf 100644 --- a/source/io/poll.cpp +++ b/source/io/poll.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "base.h" +#include "eventobject.h" #include "handle.h" #include "handle_private.h" #include "poll.h" @@ -57,7 +57,7 @@ inline PollEvent poll_event_from_sys(int event) return result; } -inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout) +inline PollEvent do_poll(EventObject &obj, PollEvent pe, int timeout) { #ifdef WIN32 if(timeout<0) @@ -107,7 +107,7 @@ Poller::Poller(): objs_changed(false) { } -void Poller::set_object(Base &obj, PollEvent ev) +void Poller::set_object(EventObject &obj, PollEvent ev) { // Verify that the object has an event handle if(ev) @@ -218,12 +218,12 @@ int Poller::do_poll(int timeout) } -PollEvent poll(Base &obj, PollEvent pe) +PollEvent poll(EventObject &obj, PollEvent pe) { return do_poll(obj, pe, -1); } -PollEvent poll(Base &obj, PollEvent pe, const Time::TimeDelta &timeout) +PollEvent poll(EventObject &obj, PollEvent pe, const Time::TimeDelta &timeout) { if(timeout