a little clean up

fairmq/FairMQMessage.h

@@ -1,28 +1,41 @@
-/*
+/**
  * FairMQMessage.h
  *
- *  Created on: Dec 5, 2012
- *      Author: dklein
+ * @since 2012-12-05
+ * @author: D. Klein, A. Rybalchenko
  */
 
 #ifndef FAIRMQMESSAGE_H_
 #define FAIRMQMESSAGE_H_
 
-#include <zmq.hpp>
-#include "Rtypes.h"
+#include <cstddef>
+
+#include <zmq.h>
 
 
 class FairMQMessage
 {
-  private:
-    zmq::message_t* fMessage;
   public:
     FairMQMessage();
-    FairMQMessage(void* data_, size_t size_, zmq::free_fn* ffn_, void* hint_ = NULL);
+    FairMQMessage(size_t size);
+    FairMQMessage(void* data, size_t size);
+
+    void Rebuild();
+    void Rebuild(size_t size);
+    void Rebuild(void* data, size_t site);
+
+    zmq_msg_t* GetMessage();
+    void* GetData();
+    size_t GetSize();
+
+    void Copy(FairMQMessage* msg);
+
+    static void CleanUp(void* data, void* hint);
+
     virtual ~FairMQMessage();
-    zmq::message_t* GetMessage();
-    Int_t Size();
-    Bool_t Copy(FairMQMessage* msg);
+
+  private:
+    zmq_msg_t fMessage;
 };
 
 #endif /* FAIRMQMESSAGE_H_ */