From 589fa57afa78f678d31204d7509cd99539c87ada Mon Sep 17 00:00:00 2001
From: Eric Cornelius <EricMCornelius@gmail.com>
Date: Wed, 15 Jan 2014 18:08:45 -0500
Subject: [PATCH 1/2] Corrects ypipe initialization when conflate is NOT
 enabled.

Fixes LIBZMQ-584
---
 src/pipe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pipe.cpp b/src/pipe.cpp
index e0d27872..cc7219ce 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -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, message_pipe_granularity> ();
     else
         inpipe = new (std::nothrow)
-            ypipe_conflate_t <msg_t> ();
+            ypipe_t <msg_t> ();
 
     alloc_assert (inpipe);
     in_active = true;

From 88a8be8231eeed87d0817339eaba00e16bbb9519 Mon Sep 17 00:00:00 2001
From: Eric Cornelius <EricMCornelius@gmail.com>
Date: Wed, 15 Jan 2014 18:11:13 -0500
Subject: [PATCH 2/2] Update pipe.cpp

---
 src/pipe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pipe.cpp b/src/pipe.cpp
index cc7219ce..4d110024 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -481,10 +481,10 @@ void zmq::pipe_t::hiccup ()
     //  Create new inpipe.
     if (conflate)
         inpipe = new (std::nothrow)
-            ypipe_conflate_t <msg_t, message_pipe_granularity> ();
+            ypipe_conflate_t <msg_t> ();
     else
         inpipe = new (std::nothrow)
-            ypipe_t <msg_t> ();
+            ypipe_t <msg_t, message_pipe_granularity> ();
 
     alloc_assert (inpipe);
     in_active = true;