Remove deprecated things

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

diff --git a/source/io/poll.h b/source/io/poll.h
index b65166d24bffb7cf8d7aea7e30f09f525c7b84d2..0fb1ebc700a86126822464b3ec3c4bdcfd45e5a4 100644 (file)
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -1,7 +1,6 @@
 #ifndef MSP_IO_POLL_H_
 #define MSP_IO_POLL_H_
 
-#include <list>
 #include <map>
 #include <vector>
 #include <msp/core/noncopyable.h>
@@ -35,38 +34,36 @@ inline PollEvent operator~(PollEvent e)
 class Poller: private NonCopyable
 {
 public:
-       struct Slot
+       struct PolledObject
        {
                EventObject *object;
                PollEvent events;
 
-               Slot(EventObject *o, PollEvent e): object(o), events(e) { }
+               PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 
-       typedef std::list<Slot> SlotList;
 private:
-       typedef std::map<EventObject *, PollEvent> EventMap;
-
        struct Private;
 
-       EventMap objects;
+       std::vector<PolledObject> objects;
        Private *priv;
+       bool events_changed;
        bool objs_changed;
-       SlotList poll_result;
+       std::vector<PolledObject> poll_result;
 
 public:
        Poller();
        ~Poller();
 
        void set_object(EventObject &, PollEvent);
-       int poll();
-       int poll(const Time::TimeDelta &);
+       unsigned poll();
+       unsigned poll(const Time::TimeDelta &);
 private:
        void rebuild_array();
-       int do_poll(int);
+       unsigned do_poll(int);
        void platform_poll(int);
 public:
-       const SlotList &get_result() const { return poll_result; }
+       const std::vector<PolledObject> &get_result() const { return poll_result; }
 };
 
 PollEvent poll(EventObject &, PollEvent);