From f5acbb5095901e56a9bfd29b9a8c1c7d3f165ce3 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 31 Aug 2010 07:01:40 +0200
Subject: naming cleanup: zmq_encoder->encoder, zmq_decoder->decoder

---
 src/encoder.hpp | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

(limited to 'src/encoder.hpp')

diff --git a/src/encoder.hpp b/src/encoder.hpp
index 0d5b6ba..54cbb34 100644
--- a/src/encoder.hpp
+++ b/src/encoder.hpp
@@ -20,11 +20,6 @@
 #ifndef __ZMQ_ENCODER_HPP_INCLUDED__
 #define __ZMQ_ENCODER_HPP_INCLUDED__
 
-#include "platform.hpp"
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
 #include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
@@ -32,6 +27,8 @@
 
 #include "err.hpp"
 
+#include "../include/zmq.h"
+
 namespace zmq
 {
 
@@ -39,11 +36,11 @@ namespace zmq
     //  fills the outgoing buffer. Derived classes should implement individual
     //  state machine actions.
 
-    template <typename T> class encoder_t
+    template <typename T> class encoder_base_t
     {
     public:
 
-        inline encoder_t (size_t bufsize_) :
+        inline encoder_base_t (size_t bufsize_) :
             bufsize (bufsize_)
         {
             buf = (unsigned char*) malloc (bufsize_);
@@ -52,7 +49,7 @@ namespace zmq
 
         //  The destructor doesn't have to be virtual. It is mad virtual
         //  just to keep ICC and code checking tools from complaining.
-        inline virtual ~encoder_t ()
+        inline virtual ~encoder_base_t ()
         {
             free (buf);
         }
@@ -153,10 +150,34 @@ namespace zmq
         size_t bufsize;
         unsigned char *buf;
 
+        encoder_base_t (const encoder_base_t&);
+        void operator = (const encoder_base_t&);
+    };
+
+    //  Encoder for 0MQ framing protocol. Converts messages into data batches.
+
+    class encoder_t : public encoder_base_t <encoder_t>
+    {
+    public:
+
+        encoder_t (size_t bufsize_);
+        ~encoder_t ();
+
+        void set_inout (struct i_inout *source_);
+
+    private:
+
+        bool size_ready ();
+        bool message_ready ();
+
+        struct i_inout *source;
+        ::zmq_msg_t in_progress;
+        unsigned char tmpbuf [10];
+
         encoder_t (const encoder_t&);
         void operator = (const encoder_t&);
     };
-
 }
 
 #endif
+
-- 
cgit v1.2.3