Use C++11 features with containers

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

diff --git a/source/io/poll.cpp b/source/io/poll.cpp
index 2e33502e8433969059dccdd1ecbde834a3e6aff7..4ca2f3d9767ea3315d172ba25dd51831afb7f660 100644 (file)
--- a/source/io/poll.cpp
+++ b/source/io/poll.cpp
@@ -1,4 +1,5 @@
 #include <stdexcept>
+#include <msp/core/algorithm.h>
 #include "eventobject.h"
 #include "poll.h"
 #include "poll_platform.h"
@@ -25,20 +26,20 @@ 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)
-               if(i->object==&obj)
+       auto i = find_member(objects, &obj, &PolledObject::object);
+       if(i!=objects.end())
+       {
+               if(ev)
+                       i->events = ev;
+               else
                {
-                       if(ev)
-                               i->events = ev;
-                       else
-                       {
-                               *i = objects.back();
-                               objects.pop_back();
-                               objs_changed = true;
-                       }
-                       events_changed = true;
-                       return;
+                       *i = objects.back();
+                       objects.pop_back();
+                       objs_changed = true;
                }
+               events_changed = true;
+               return;
+       }
 
        if(!ev)
                return;
@@ -48,16 +49,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 +66,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 +83,6 @@ int Poller::do_poll(int timeout)
 }
 
 
-
 PollEvent platform_poll(EventObject &, PollEvent, int);
 
 PollEvent poll(EventObject &obj, PollEvent pe)