fixed failed merge with autogen.sh

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