summaryrefslogtreecommitdiff
path: root/bindings/cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2010-01-23 08:20:01 +0100
committerMartin Sustrik <sustrik@fastmq.commkdir>2010-01-23 08:20:01 +0100
commitdf4548aa76617314cb1a47e6d408cc663640cd70 (patch)
tree43177de29fa5a41420fd5fec54368d2035c19f78 /bindings/cpp
parent2634934999408124837afceaf577b75ed58116d7 (diff)
parentd762e1a9c976680dde2d2f38dac9f5861bd82dad (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'bindings/cpp')
-rw-r--r--bindings/cpp/zmq.hpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/bindings/cpp/zmq.hpp b/bindings/cpp/zmq.hpp
index 0afeff0..aecdb0d 100644
--- a/bindings/cpp/zmq.hpp
+++ b/bindings/cpp/zmq.hpp
@@ -33,14 +33,6 @@ namespace zmq
typedef zmq_free_fn free_fn;
typedef zmq_pollitem_t pollitem_t;
- inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1)
- {
- int rc = zmq_poll (items_, nitems_, timeout_);
- if (rc < 0)
- throw error_t ();
- return rc;
- }
-
class error_t : public std::exception
{
public:
@@ -57,6 +49,14 @@ namespace zmq
int errnum;
};
+ inline int poll (zmq_pollitem_t *items_, int nitems_, long timeout_ = -1)
+ {
+ int rc = zmq_poll (items_, nitems_, timeout_);
+ if (rc < 0)
+ throw error_t ();
+ return rc;
+ }
+
class message_t : private zmq_msg_t
{
friend class socket_t;