diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-11-04 09:48:25 +0100 |
commit | 05ce301f3571e3e690792a189cb927328163f0bc (patch) | |
tree | 1145b921033a2b88e9b987ec1d3e03060559702d /src/encoder.cpp | |
parent | a8362abf11b51dd553766fb07a9e60f28e788126 (diff) | |
parent | 6cdd720400ea456ccbfdf09cdc5054ab07dbdc6f (diff) |
Merge branch 'master' of github.com:zeromq/libzmq
Diffstat (limited to 'src/encoder.cpp')
-rw-r--r-- | src/encoder.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/encoder.cpp b/src/encoder.cpp index 8689e45..030b3ef 100644 --- a/src/encoder.cpp +++ b/src/encoder.cpp @@ -1,5 +1,7 @@ /* - Copyright (c) 2007-2011 iMatix Corporation + Copyright (c) 2009-2011 250bpm s.r.o. + Copyright (c) 2007-2009 iMatix Corporation + Copyright (c) 2011 VMware, Inc. Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file This file is part of 0MQ. @@ -89,14 +91,14 @@ bool zmq::encoder_t::message_ready () tmpbuf [0] = (unsigned char) size; tmpbuf [1] = (in_progress.flags () & ~msg_t::shared); next_step (tmpbuf, 2, &encoder_t::size_ready, - !(in_progress.flags () & (msg_t::more | msg_t::label))); + !(in_progress.flags () & msg_t::more)); } else { tmpbuf [0] = 0xff; put_uint64 (tmpbuf + 1, size); tmpbuf [9] = (in_progress.flags () & ~msg_t::shared); next_step (tmpbuf, 10, &encoder_t::size_ready, - !(in_progress.flags () & (msg_t::more | msg_t::label))); + !(in_progress.flags () & msg_t::more)); } return true; } |