From 23bd3726a57793b850cb26e22274fd188fb86e82 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 24 Mar 2011 14:59:43 +0100 Subject: ZMQ_RCVMORE type changed to int Signed-off-by: Martin Sustrik --- doc/zmq_getsockopt.txt | 2 +- src/socket_base.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/zmq_getsockopt.txt b/doc/zmq_getsockopt.txt index 749d14e..be3c17f 100644 --- a/doc/zmq_getsockopt.txt +++ b/doc/zmq_getsockopt.txt @@ -51,7 +51,7 @@ Refer to linkzmq:zmq_send[3] and linkzmq:zmq_recv[3] for a detailed description of sending/receiving multi-part messages. [horizontal] -Option value type:: int64_t +Option value type:: int Option value unit:: boolean Default value:: N/A Applicable socket types:: all diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 093bbe0..a41622e 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -244,12 +244,12 @@ int zmq::socket_base_t::getsockopt (int option_, void *optval_, } if (option_ == ZMQ_RCVMORE) { - if (*optvallen_ < sizeof (int64_t)) { + if (*optvallen_ < sizeof (int)) { errno = EINVAL; return -1; } - *((int64_t*) optval_) = rcvmore ? 1 : 0; - *optvallen_ = sizeof (int64_t); + *((int*) optval_) = rcvmore ? 1 : 0; + *optvallen_ = sizeof (int); return 0; } -- cgit v1.2.3