X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fpoll.h;h=c8739239d960f4f801d1f1bd22846ddcd3a9989e;hb=4ad05c650c55e3edccea887d15b26f41cdf60fb6;hp=b65166d24bffb7cf8d7aea7e30f09f525c7b84d2;hpb=c3e242c2629cbc9645258b30aaf07b7285d4372b;p=libs%2Fcore.git

diff --git a/source/io/poll.h b/source/io/poll.h
index b65166d..c873923 100644
--- 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;
+		EventObject *object = nullptr;
+		PollEvent events = P_NONE;
 
-		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;
-	Private *priv;
-	bool objs_changed;
-	SlotList poll_result;
+	std::vector<PolledObject> objects;
+	Private *priv = nullptr;
+	bool events_changed = false;
+	bool objs_changed = false;
+	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);