X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpoll.h;h=c8739239d960f4f801d1f1bd22846ddcd3a9989e;hp=40c15a70cb84389caa0d9df7a0273383dbc87ac2;hb=HEAD;hpb=242a4a9abe1e1113b5eb39aa751aa054f696d7be

diff --git a/source/io/poll.h b/source/io/poll.h
index 40c15a7..53e3808 100644
--- a/source/io/poll.h
+++ b/source/io/poll.h
@@ -3,7 +3,7 @@
 
 #include <map>
 #include <vector>
-#include <msp/core/attributes.h>
+#include <msp/core/mspcore_api.h>
 #include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
 
@@ -32,27 +32,22 @@ inline PollEvent operator~(PollEvent e)
 { return PollEvent(~static_cast<int>(e)); }
 
 
-class Poller: private NonCopyable
+class MSPCORE_API Poller: private NonCopyable
 {
 public:
 	struct PolledObject
 	{
 		EventObject *object;
 		PollEvent events;
-
-		PolledObject(EventObject *o, PollEvent e): object(o), events(e) { }
 	};
 
-	typedef PolledObject Slot DEPRECATED;
-
-	typedef std::vector<PolledObject> SlotList DEPRECATED;
 private:
 	struct Private;
 
 	std::vector<PolledObject> objects;
-	Private *priv;
-	bool events_changed;
-	bool objs_changed;
+	Private *priv = nullptr;
+	bool events_changed = false;
+	bool objs_changed = false;
 	std::vector<PolledObject> poll_result;
 
 public:
@@ -70,8 +65,8 @@ public:
 	const std::vector<PolledObject> &get_result() const { return poll_result; }
 };
 
-PollEvent poll(EventObject &, PollEvent);
-PollEvent poll(EventObject &, PollEvent, const Time::TimeDelta &);
+MSPCORE_API PollEvent poll(EventObject &, PollEvent);
+MSPCORE_API PollEvent poll(EventObject &, PollEvent, const Time::TimeDelta &);
 
 } // namespace IO
 } // namespace Msp