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

Problem: poll is mutating by definition

Browse Source 
Solution: Remove const qualifiers and const_cast
This commit is contained in:
Gudmundur Adalsteinsson 2019-03-26 21:25:40 +00:00
parent 91fd0b5e0e
commit 0e55254bd6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
zmq.hpp
View File

@ -147,29 +147,54 @@ class error_t : public std::exception
int errnum; int errnum;
}; };
inline int poll(zmq_pollitem_t const *items_, size_t nitems_, long timeout_ = -1) inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1)
{ {
int rc = zmq_poll(const_cast<zmq_pollitem_t *>(items_), int rc = zmq_poll(items_, static_cast<int>(nitems_), timeout_);
static_cast<int>(nitems_), timeout_);
if (rc < 0) if (rc < 0)
throw error_t(); throw error_t();
return rc; return rc;
} }
ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
inline int poll(zmq_pollitem_t const *items_, size_t nitems_, long timeout_ = -1)
{
return poll(const_cast<zmq_pollitem_t *>(items_), nitems_, timeout_);
}
#ifdef ZMQ_CPP11 #ifdef ZMQ_CPP11
ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
inline int inline int
poll(zmq_pollitem_t const *items, size_t nitems, std::chrono::milliseconds timeout) poll(zmq_pollitem_t const *items, size_t nitems, std::chrono::milliseconds timeout)
{
return poll(const_cast<zmq_pollitem_t *>(items), nitems, static_cast<long>(timeout.count()));
}
ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
inline int poll(std::vector<zmq_pollitem_t> const &items,
std::chrono::milliseconds timeout)
{
return poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(), static_cast<long>(timeout.count()));
}
ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
inline int poll(std::vector<zmq_pollitem_t> const &items, long timeout_ = -1)
{
return poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(), timeout_);
}
inline int
poll(zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout)
{ {
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> const &items, inline int poll(std::vector<zmq_pollitem_t> &items,
std::chrono::milliseconds timeout) std::chrono::milliseconds timeout)
{ {
return poll(items.data(), items.size(), static_cast<long>(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> &items, long timeout_ = -1)
{ {
return poll(items.data(), items.size(), timeout_); return poll(items.data(), items.size(), timeout_);
} }