Merge pull request #827 from EricMCornelius/master

Corrects ypipe initialization when conflate is NOT enabled.

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> ();
     else
         inpipe = new (std::nothrow)
-            ypipe_conflate_t <msg_t> ();
+            ypipe_t <msg_t, message_pipe_granularity> ();
 
     alloc_assert (inpipe);
     in_active = true;