Merge pull request #309 from gummif/gfa/poller-millis

sigiesec · web-flow · commit 132f7b00dfde · 2019-04-07T21:15:59.000+02:00
Problem: zmq_poller_wait_all is called with microseconds count
diff --git a/zmq.hpp b/zmq.hpp
@@ -1223,7 +1223,7 @@ template<typename T = void> class poller_t
     }
 
     size_t wait_all(std::vector<zmq_poller_event_t> &poller_events,
-                    const std::chrono::microseconds timeout)
+                    const std::chrono::milliseconds timeout)
     {
         int rc = zmq_poller_wait_all(poller_ptr.get(), poller_events.data(),
                                      static_cast<int>(poller_events.size()),

Original file line number	Diff line number	Diff line change
`@@ -1223,7 +1223,7 @@ template<typename T = void> class poller_t`
`1223`	`1223`	`}`
`1224`	`1224`
`1225`	`1225`	`size_t wait_all(std::vector<zmq_poller_event_t> &poller_events,`
`1226`		`- const std::chrono::microseconds timeout)`
	`1226`	`+ const std::chrono::milliseconds timeout)`
`1227`	`1227`	`{`
`1228`	`1228`	`int rc = zmq_poller_wait_all(poller_ptr.get(), poller_events.data(),`
`1229`	`1229`	`static_cast<int>(poller_events.size()),`