generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #827 from EricMCornelius/master

Browse Source 
Corrects ypipe initialization when conflate is NOT enabled.
This commit is contained in:
Pieter Hintjens 2014-01-15 22:08:19 -08:00
commit 22655d05c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pipe.cpp
View File

@ -481,10 +481,10 @@ void zmq::pipe_t::hiccup ()
// Create new inpipe.
if (conflate)
inpipe = new (std::nothrow)
ypipe_t <msg_t, message_pipe_granularity> ();
ypipe_conflate_t <msg_t> ();
else
inpipe = new (std::nothrow)
ypipe_conflate_t <msg_t> ();
ypipe_t <msg_t, message_pipe_granularity> ();
alloc_assert (inpipe);
in_active = true;