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

Problem: poll default timeout is deprecated

Browse Source 
Solution: default to std::chrono::milliseconds
This commit is contained in:
Gudmundur Adalsteinsson 2021-06-29 22:23:38 +00:00
parent 4108a5d266
commit 7aa3f37a5c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zmq.hpp
View File

@ -299,7 +299,12 @@ class error_t : public std::exception
int errnum; int errnum;
}; };
#ifdef ZMQ_CPP11
ZMQ_DEPRECATED("from 4.8.0, use poll taking std::chrono::duration instead of long")
inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_)
#else
inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1) inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1)
#endif
{ {
int rc = zmq_poll(items_, static_cast<int>(nitems_), timeout_); int rc = zmq_poll(items_, static_cast<int>(nitems_), timeout_);
if (rc < 0) if (rc < 0)
@ -337,19 +342,19 @@ inline int poll(std::vector<zmq_pollitem_t> const &items, long timeout_ = -1)
} }
inline int inline int
poll(zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout) poll(zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout = std::chrono::milliseconds{-1})
{ {
return poll(items, nitems, static_cast<long>(timeout.count())); return poll(items, nitems, static_cast<long>(timeout.count()));
} }
inline int poll(std::vector<zmq_pollitem_t> &items, inline int poll(std::vector<zmq_pollitem_t> &items,
std::chrono::milliseconds timeout) std::chrono::milliseconds timeout = std::chrono::milliseconds{-1})
{ {
return poll(items.data(), items.size(), static_cast<long>(timeout.count())); return poll(items.data(), items.size(), static_cast<long>(timeout.count()));
} }
ZMQ_DEPRECATED("from 4.3.1, use poll taking std::chrono instead of long") ZMQ_DEPRECATED("from 4.3.1, use poll taking std::chrono::duration instead of long")
inline int poll(std::vector<zmq_pollitem_t> &items, long timeout_ = -1) inline int poll(std::vector<zmq_pollitem_t> &items, long timeout_)
{ {
return poll(items.data(), items.size(), timeout_); return poll(items.data(), items.size(), timeout_);
} }