summaryrefslogtreecommitdiff
path: root/bindings/cpp
diff options
context:
space:
mode:
authormalosek <malosek@fastmq.com>2010-01-05 11:05:03 +0100
committermalosek <malosek@fastmq.com>2010-01-05 11:05:03 +0100
commit472ddf8de2c93f750831d52b5473cdbed1db51e8 (patch)
tree476650afd868502a5a023599910c5415fdc57fe6 /bindings/cpp
parentd10c605fa94a8fe8265785043aeef63983e07f3f (diff)
parent4f6baf4dde627656b63cc4e2acdb78a8577ba640 (diff)
fixed failed merge with autogen.sh
Diffstat (limited to 'bindings/cpp')
-rw-r--r--bindings/cpp/zmq.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp
index 4349f0b..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.
@@ -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