Add move semantics to Variant

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

diff --git a/source/io/poll.h b/source/io/poll.h
index fdb68c515bbe35e0e05cafdde93e59c625a7bced..53e3808feceb4a00845e5a9ec63d0ae5918d8544 100644 (file)
--- 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,44 +32,41 @@ inline PollEvent operator~(PollEvent e)
 { return PollEvent(~static_cast<int>(e)); }
 
 
-class Poller: private NonCopyable
+class MSPCORE_API Poller: private NonCopyable
 {
 public:
-       struct Slot
+       struct PolledObject
        {
                EventObject *object;
                PollEvent events;
-
-               Slot(EventObject *o, PollEvent e): object(o), events(e) { }
        };
 
-       typedef std::vector<Slot> SlotList DEPRECATED;
 private:
        struct Private;
 
-       std::vector<Slot> objects;
-       Private *priv;
-       bool events_changed;
-       bool objs_changed;
-       std::vector<Slot> 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 std::vector<Slot> &get_result() const { return poll_result; }
+       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