]> git.tdb.fi Git - libs/core.git/blobdiff - source/io/poll.h
Use nullptr instead of 0 for pointers
[libs/core.git] / source / io / poll.h
index 40c15a70cb84389caa0d9df7a0273383dbc87ac2..c8739239d960f4f801d1f1bd22846ddcd3a9989e 100644 (file)
@@ -3,7 +3,6 @@
 
 #include <map>
 #include <vector>
-#include <msp/core/attributes.h>
 #include <msp/core/noncopyable.h>
 #include <msp/time/timedelta.h>
 
@@ -37,22 +36,19 @@ class Poller: private NonCopyable
 public:
        struct PolledObject
        {
-               EventObject *object;
-               PollEvent events;
+               EventObject *object = nullptr;
+               PollEvent events = P_NONE;
 
                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: