Skip to content

Commit

Permalink
Merge pull request #545 from hurtonm/master
Browse files Browse the repository at this point in the history
Interoperate with higher versions of ZMTP protocol
  • Loading branch information
hintjens committed Apr 14, 2013
2 parents c5721f9 + e52c436 commit f4a07b3
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/stream_engine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,7 @@ bool zmq::stream_engine_t::handshake ()
in_batch_size, options.maxmsgsize);
alloc_assert (decoder);
}
else
if (greeting_recv [revision_pos] == ZMTP_2_0
|| greeting_recv [revision_pos] == ZMTP_2_1) {
else {
encoder = new (std::nothrow) v2_encoder_t (out_batch_size);
alloc_assert (encoder);

Expand Down

0 comments on commit f4a07b3

Please sign in to comment.