From f2b235db165e459f7f265993477dae0dc987125a Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Mon, 4 Jan 2010 15:46:20 +0100 Subject: ZMQII-29: Add timeout to zmq_poll function --- bindings/cpp/zmq.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bindings/cpp/zmq.hpp') diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp index 4349f0b..6d5bbab 100644 --- a/bindings/cpp/zmq.hpp +++ b/bindings/cpp/zmq.hpp @@ -33,9 +33,9 @@ namespace zmq typedef zmq_free_fn free_fn; typedef zmq_pollitem_t pollitem_t; - inline int poll (zmq_pollitem_t *items_, int nitems_) + inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1) { - return zmq_poll (items_, nitems_); + return zmq_poll (items_, nitems_, timeout_); } class error_t : public std::exception -- cgit v1.2.3 From 4f6baf4dde627656b63cc4e2acdb78a8577ba640 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 5 Jan 2010 08:29:35 +0100 Subject: Copyrights transferred from FastMQ to iMatix --- bindings/cpp/zmq.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings/cpp/zmq.hpp') diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp index 6d5bbab..a572c69 100644 --- a/bindings/cpp/zmq.hpp +++ b/bindings/cpp/zmq.hpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. -- cgit v1.2.3