generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-05-04 16:28:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101 from JohanMabille/warning_fix

Browse Source 
Fixed warnings in c++11 poll functions
This commit is contained in:
Luca Boccassi 2016-12-09 14:04:25 +01:00 committed by GitHub
commit 229e7a849b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zmq.hpp
View File

@ -155,12 +155,12 @@ namespace zmq
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout) 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) 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) inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)