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/c/zmq.h | 2 +- bindings/cpp/zmq.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bindings') diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index 7d3544e..7ad70e7 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -202,7 +202,7 @@ typedef struct short revents; } zmq_pollitem_t; -ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems); +ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout); //////////////////////////////////////////////////////////////////////////////// // Helper functions. 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/c/zmq.h | 2 +- bindings/cpp/zmq.hpp | 2 +- bindings/java/Context.cpp | 2 +- bindings/java/Socket.cpp | 2 +- bindings/java/org/zmq/Context.java | 2 +- bindings/java/org/zmq/Socket.java | 2 +- bindings/python/pyzmq.cpp | 2 +- bindings/ruby/extconf.rb | 2 +- bindings/ruby/rbzmq.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) (limited to 'bindings') diff --git a/bindings/c/zmq.h b/bindings/c/zmq.h index 7ad70e7..3bcee9d 100644 --- a/bindings/c/zmq.h +++ b/bindings/c/zmq.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. 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. diff --git a/bindings/java/Context.cpp b/bindings/java/Context.cpp index 652a120..f3f74ff 100644 --- a/bindings/java/Context.cpp +++ b/bindings/java/Context.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/Socket.cpp b/bindings/java/Socket.cpp index 26c6003..eaf1b22 100644 --- a/bindings/java/Socket.cpp +++ b/bindings/java/Socket.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/org/zmq/Context.java b/bindings/java/org/zmq/Context.java index 408c6b0..3c00ba8 100644 --- a/bindings/java/org/zmq/Context.java +++ b/bindings/java/org/zmq/Context.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/java/org/zmq/Socket.java b/bindings/java/org/zmq/Socket.java index 075e322..1b427c3 100644 --- a/bindings/java/org/zmq/Socket.java +++ b/bindings/java/org/zmq/Socket.java @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/python/pyzmq.cpp b/bindings/python/pyzmq.cpp index 425effe..7a53c8e 100644 --- a/bindings/python/pyzmq.cpp +++ b/bindings/python/pyzmq.cpp @@ -1,5 +1,5 @@ /* - Copyright (c) 2007-2009 FastMQ Inc. + Copyright (c) 2007-2010 iMatix Corporation This file is part of 0MQ. diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index f931c5e..d5778d0 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -1,5 +1,5 @@ # -# Copyright (c) 2007-2009 FastMQ Inc. +# Copyright (c) 2007-2010 iMatix Corporation # # This file is part of 0MQ. # diff --git a/bindings/ruby/rbzmq.cpp b/bindings/ruby/rbzmq.cpp index 10ff55f..fce749c 100644 --- a/bindings/ruby/rbzmq.cpp +++ b/bindings/ruby/rbzmq.cpp @@ -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