Merge pull request #809 from hurtonm/master

Simplify ypipe_t and ypipe_base_t template parameters

src/pipe.cpp

@@ -33,7 +33,7 @@ int zmq::pipepair (class object_t *parents_ [2], class pipe_t* pipes_ [2],
     //   each to pass messages in one direction.
 
     typedef ypipe_t <msg_t, message_pipe_granularity> upipe_normal_t;
-    typedef ypipe_conflate_t <msg_t, message_pipe_granularity> upipe_conflate_t;
+    typedef ypipe_conflate_t <msg_t> upipe_conflate_t;
 
     pipe_t::upipe_t *upipe1;
     if(conflate_ [0])
@@ -469,7 +469,7 @@ void zmq::pipe_t::hiccup ()
             ypipe_t <msg_t, message_pipe_granularity> ();
     else
         inpipe = new (std::nothrow)
-            ypipe_conflate_t <msg_t, message_pipe_granularity> ();
+            ypipe_conflate_t <msg_t> ();
 
     alloc_assert (inpipe);
     in_active = true;

src/pipe.hpp

@@ -118,7 +118,7 @@ namespace zmq
     private:
 
         //  Type of the underlying lock-free pipe.
-        typedef ypipe_base_t <msg_t, message_pipe_granularity> upipe_t;
+        typedef ypipe_base_t <msg_t> upipe_t;
 
         //  Command handlers.
         void process_activate_read ();

src/ypipe.hpp

@@ -35,7 +35,7 @@ namespace zmq
     //  N is granularity of the pipe, i.e. how many items are needed to
     //  perform next memory allocation.
 
-    template <typename T, int N> class ypipe_t : public ypipe_base_t<T,N>
+    template <typename T, int N> class ypipe_t : public ypipe_base_t <T>
     {
     public:
 

src/ypipe_base.hpp

@@ -28,7 +28,7 @@ namespace zmq
     // classes, one is selected according to a the conflate
     // socket option
 
-    template <typename T, int N> class ypipe_base_t
+    template <typename T> class ypipe_base_t
     {
     public:
         virtual ~ypipe_base_t () {}

src/ypipe_conflate.hpp

@@ -34,7 +34,7 @@ namespace zmq
     //  reader_awake flag is needed here to mimic ypipe delicate behaviour
     //  around the reader being asleep (see 'c' pointer being NULL in ypipe.hpp)
 
-    template <typename T, int N> class ypipe_conflate_t : public ypipe_base_t<T,N>
+    template <typename T> class ypipe_conflate_t : public ypipe_base_t <T>
     {
     public: