summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-03-23 15:26:47 +0100
committerMartin Sustrik <sustrik@250bpm.com>2011-03-23 15:26:47 +0100
commit34d7854199ab89faf2edfc3305932cc07b2030ab (patch)
tree8b6bf1006615609748d668defabf9e6c383ded3d
parentdee5f650dde07ec71f482e825984a31028467d1b (diff)
Obsolete constants ZMQ_UPSTREAM and ZMQ_DOWNSTREAM removed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--devices/zmq_streamer/zmq_streamer.cpp4
-rw-r--r--include/zmq.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/devices/zmq_streamer/zmq_streamer.cpp b/devices/zmq_streamer/zmq_streamer.cpp
index ca7c21b..951115c 100644
--- a/devices/zmq_streamer/zmq_streamer.cpp
+++ b/devices/zmq_streamer/zmq_streamer.cpp
@@ -54,8 +54,8 @@ int main (int argc, char *argv [])
// TODO: make the number of I/O threads configurable.
zmq::context_t ctx (1);
- zmq::socket_t in_socket (ctx, ZMQ_UPSTREAM);
- zmq::socket_t out_socket (ctx, ZMQ_DOWNSTREAM);
+ zmq::socket_t in_socket (ctx, ZMQ_PULL);
+ zmq::socket_t out_socket (ctx, ZMQ_PUSH);
int n = 0;
while (true) {
diff --git a/include/zmq.h b/include/zmq.h
index 5974db4..6e90b56 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -181,8 +181,6 @@ ZMQ_EXPORT int zmq_term (void *context);
#define ZMQ_PUSH 8
#define ZMQ_XPUB 9
#define ZMQ_XSUB 10
-#define ZMQ_UPSTREAM ZMQ_PULL /* Old alias, remove in 3.x */
-#define ZMQ_DOWNSTREAM ZMQ_PUSH /* Old alias, remove in 3.x */
/* Socket options. */
#define ZMQ_HWM 1