diff options
author | Martin Lucina <martin@lucina.net> | 2012-05-20 11:24:59 +0200 |
---|---|---|
committer | Martin Lucina <martin@lucina.net> | 2012-05-20 11:24:59 +0200 |
commit | e4a32d2c3227d8e2f3a2a3a3cb51bd021f57a8c2 (patch) | |
tree | 10978c613cca68ab3733e7d51c5c4963464f18df /src/encoder.cpp | |
parent | 0118255d0413fa469c0a7c569e05cc79bf5f5b7d (diff) | |
parent | 56619463ac26dc6c3e576d2fbf6b544eebeb5148 (diff) |
Merge tag 'upstream/2.2.0'
Upstream version 2.2.0
Diffstat (limited to 'src/encoder.cpp')
-rw-r--r-- | src/encoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoder.cpp b/src/encoder.cpp index 88e1dff..8f7b4b6 100644 --- a/src/encoder.cpp +++ b/src/encoder.cpp @@ -75,14 +75,14 @@ bool zmq::encoder_t::message_ready () // message size. In both cases 'flags' field follows. if (size < 255) { tmpbuf [0] = (unsigned char) size; - tmpbuf [1] = (in_progress.flags & ~ZMQ_MSG_SHARED); + tmpbuf [1] = (in_progress.flags & ZMQ_MSG_MORE); next_step (tmpbuf, 2, &encoder_t::size_ready, !(in_progress.flags & ZMQ_MSG_MORE)); } else { tmpbuf [0] = 0xff; put_uint64 (tmpbuf + 1, size); - tmpbuf [9] = (in_progress.flags & ~ZMQ_MSG_SHARED); + tmpbuf [9] = (in_progress.flags & ZMQ_MSG_MORE); next_step (tmpbuf, 10, &encoder_t::size_ready, !(in_progress.flags & ZMQ_MSG_MORE)); } |