Additional adjustments for Poller

[libs/core.git] / source / io / poll.cpp

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index 2e33502e8433969059dccdd1ecbde834a3e6aff7..a5d2d023c81d3f1ae730fc69d8d903b5546926db 100644 (file)
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -25,7 +25,7 @@ void Poller::set_object(EventObject &obj, PollEvent ev)
        if(ev)
                obj.get_event_handle();
 
-       for(vector<Slot>::iterator i=objects.begin(); i!=objects.end(); ++i)
+       for(vector<PolledObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
                if(i->object==&obj)
                {
                        if(ev)
@@ -48,16 +48,16 @@ void Poller::set_object(EventObject &obj, PollEvent ev)
                throw logic_error("Maximum number of wait objects reached");
 #endif
 
-       objects.push_back(Slot(&obj, ev));
+       objects.push_back(PolledObject(&obj, ev));
        objs_changed = true;
 }
 
-int Poller::poll()
+unsigned Poller::poll()
 {
        return do_poll(-1);
 }
 
-int Poller::poll(const Time::TimeDelta &timeout)
+unsigned Poller::poll(const Time::TimeDelta &timeout)
 {
        if(timeout<Time::zero)
                throw invalid_argument("Poller::poll");
@@ -65,7 +65,7 @@ int Poller::poll(const Time::TimeDelta &timeout)
        return do_poll(static_cast<int>(timeout/Time::msec));
 }
 
-int Poller::do_poll(int timeout)
+unsigned Poller::do_poll(int timeout)
 {
        if(objs_changed || events_changed)
        {
@@ -82,7 +82,6 @@ int Poller::do_poll(int timeout)
 }
 
 
-
 PollEvent platform_poll(EventObject &, PollEvent, int);
 
 PollEvent poll(EventObject &obj, PollEvent pe)