@@ -299,7 +299,12 @@ class error_t : public std::exception
299
299
int errnum;
300
300
};
301
301
302
+ #ifdef ZMQ_CPP11
303
+ ZMQ_DEPRECATED (" from 4.8.0, use poll taking std::chrono::duration instead of long" )
304
+ inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_)
305
+ #else
302
306
inline int poll (zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1 )
307
+ #endif
303
308
{
304
309
int rc = zmq_poll (items_, static_cast <int >(nitems_), timeout_);
305
310
if (rc < 0 )
@@ -337,19 +342,19 @@ inline int poll(std::vector<zmq_pollitem_t> const &items, long timeout_ = -1)
337
342
}
338
343
339
344
inline int
340
- poll (zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout)
345
+ poll (zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout = std::chrono::milliseconds{- 1 } )
341
346
{
342
347
return poll (items, nitems, static_cast <long >(timeout.count ()));
343
348
}
344
349
345
350
inline int poll (std::vector<zmq_pollitem_t > &items,
346
- std::chrono::milliseconds timeout)
351
+ std::chrono::milliseconds timeout = std::chrono::milliseconds{- 1 } )
347
352
{
348
353
return poll (items.data (), items.size (), static_cast <long >(timeout.count ()));
349
354
}
350
355
351
- ZMQ_DEPRECATED (" from 4.3.1, use poll taking std::chrono instead of long" )
352
- inline int poll(std::vector<zmq_pollitem_t > &items, long timeout_ = - 1 )
356
+ ZMQ_DEPRECATED (" from 4.3.1, use poll taking std::chrono::duration instead of long" )
357
+ inline int poll(std::vector<zmq_pollitem_t > &items, long timeout_)
353
358
{
354
359
return poll (items.data (), items.size (), timeout_);
355
360
}
0 commit comments