Merge pull request #101 from JohanMabille/warning_fix

bluca · web-flow · commit 229e7a849b6f · 2016-12-09T14:04:25.000+01:00
Fixed warnings in c++11 poll functions
diff --git a/zmq.hpp b/zmq.hpp
@@ -155,12 +155,12 @@ namespace zmq
     #ifdef ZMQ_CPP11
     inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout)
     {
-        return poll(items, nitems, timeout.count() );
+        return poll(items, nitems, static_cast<long>(timeout.count()));
     }
 
     inline int poll(std::vector<zmq_pollitem_t> const& items, std::chrono::milliseconds timeout)
     {
-        return poll(items.data(), items.size(), timeout.count() );
+        return poll(items.data(), items.size(), static_cast<long>(timeout.count()));
     }
 
     inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)

Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,12 @@ namespace zmq`
`155`	`155`	`#ifdef ZMQ_CPP11`
`156`	`156`	`inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout)`
`157`	`157`	`{`
`158`		`- return poll(items, nitems, timeout.count() );`
	`158`	`+ return poll(items, nitems, static_cast<long>(timeout.count()));`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`inline int poll(std::vector<zmq_pollitem_t> const& items, std::chrono::milliseconds timeout)`
`162`	`162`	`{`
`163`		`- return poll(items.data(), items.size(), timeout.count() );`
	`163`	`+ return poll(items.data(), items.size(), static_cast<long>(timeout.count()));`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)`