summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/zmq.h7
-rw-r--r--include/zmq.hpp6
2 files changed, 6 insertions, 7 deletions
diff --git a/include/zmq.h b/include/zmq.h
index 90a73c2..b8ab6d4 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -82,10 +82,10 @@ ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
#endif
/* Native 0MQ error codes. */
-#define EMTHREAD (ZMQ_HAUSNUMERO + 50)
#define EFSM (ZMQ_HAUSNUMERO + 51)
#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
#define ETERM (ZMQ_HAUSNUMERO + 53)
+#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
/* This function retrieves the errno as it is known to 0MQ library. The goal */
/* of this function is to make the code 100% portable, including where 0MQ */
@@ -177,6 +177,9 @@ ZMQ_EXPORT int zmq_term (void *context);
#define ZMQ_SNDBUF 11
#define ZMQ_RCVBUF 12
#define ZMQ_RCVMORE 13
+#define ZMQ_FD 14
+#define ZMQ_EVENTS 15
+#define ZMQ_TYPE 16
/* Send/recv options. */
#define ZMQ_NOBLOCK 1
@@ -225,8 +228,6 @@ ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
ZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket);
-#undef ZMQ_EXPORT
-
#ifdef __cplusplus
}
#endif
diff --git a/include/zmq.hpp b/include/zmq.hpp
index 86ffff6..3fb5a79 100644
--- a/include/zmq.hpp
+++ b/include/zmq.hpp
@@ -94,8 +94,7 @@ namespace zmq
inline ~message_t ()
{
int rc = zmq_msg_close (this);
- if (rc != 0)
- throw error_t ();
+ assert (rc == 0);
}
inline void rebuild ()
@@ -202,8 +201,7 @@ namespace zmq
inline ~socket_t ()
{
int rc = zmq_close (ptr);
- if (rc != 0)
- throw error_t ();
+ assert (rc == 0);
}
inline operator void* ()