Diff: std_msgs/ByteMultiArray.h

Revision:

3:1cf99502f396

Parent:

1:ff0ec969dad1

--- a/std_msgs/ByteMultiArray.h	Sun Oct 16 09:35:11 2011 +0000
+++ b/std_msgs/ByteMultiArray.h	Sat Nov 12 23:54:45 2011 +0000
@@ -1,69 +1,58 @@
-#ifndef ros_ByteMultiArray_h
-#define ros_ByteMultiArray_h
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "../ros/msg.h"
-#include "std_msgs/MultiArrayLayout.h"
-
-namespace std_msgs
-{
-
-  class ByteMultiArray : public ros::Msg
-  {
-    public:
-      std_msgs::MultiArrayLayout layout;
-      uint8_t data_length;
-      uint8_t st_data;
-      uint8_t * data;
-
-    virtual int serialize(unsigned char *outbuffer)
-    {
-      int offset = 0;
-      offset += this->layout.serialize(outbuffer + offset);
-      *(outbuffer + offset++) = data_length;
-      *(outbuffer + offset++) = 0;
-      *(outbuffer + offset++) = 0;
-      *(outbuffer + offset++) = 0;
-      for( unsigned char i = 0; i < data_length; i++){
-      union {
-        uint8_t real;
-        uint8_t base;
-      } u_datai;
-      u_datai.real = this->data[i];
-      *(outbuffer + offset + 0) = (u_datai.base >> (8 * 0)) & 0xFF;
-      offset += sizeof(this->data[i]);
-      }
-      return offset;
-    }
-
-    virtual int deserialize(unsigned char *inbuffer)
-    {
-      int offset = 0;
-      offset += this->layout.deserialize(inbuffer + offset);
-      unsigned char data_lengthT = *(inbuffer + offset++);
-      if(data_lengthT > data_length)
-        this->data = (unsigned char*)realloc(this->data, data_lengthT * sizeof(unsigned char));
-      offset += 3;
-      data_length = data_lengthT;
-      for( unsigned char i = 0; i < data_length; i++){
-      union {
-        uint8_t real;
-        uint8_t base;
-      } u_st_data;
-      u_st_data.base = 0;
-      u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      this->st_data = u_st_data.real;
-      offset += sizeof(this->st_data);
-        memcpy( &(this->data[i]), &(this->st_data), sizeof(unsigned char));
-      }
-     return offset;
-    }
-
-   virtual const char * getType(){ return "std_msgs/ByteMultiArray"; };
-
-  };
-
-}
+#ifndef _ROS_std_msgs_ByteMultiArray_h
+#define _ROS_std_msgs_ByteMultiArray_h
+
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include "ros/msg.h"
+#include "std_msgs/MultiArrayLayout.h"
+#include "std_msgs/byte.h"
+
+namespace std_msgs
+{
+
+  class ByteMultiArray : public ros::Msg
+  {
+    public:
+      std_msgs::MultiArrayLayout layout;
+      uint8_t data_length;
+      std_msgs::byte st_data;
+      std_msgs::byte * data;
+
+    virtual int serialize(unsigned char *outbuffer) const
+    {
+      int offset = 0;
+      offset += this->layout.serialize(outbuffer + offset);
+      *(outbuffer + offset++) = data_length;
+      *(outbuffer + offset++) = 0;
+      *(outbuffer + offset++) = 0;
+      *(outbuffer + offset++) = 0;
+      for( uint8_t i = 0; i < data_length; i++){
+      offset += this->data[i].serialize(outbuffer + offset);
+      }
+      return offset;
+    }
+
+    virtual int deserialize(unsigned char *inbuffer)
+    {
+      int offset = 0;
+      offset += this->layout.deserialize(inbuffer + offset);
+      uint8_t data_lengthT = *(inbuffer + offset++);
+      if(data_lengthT > data_length)
+        this->data = (std_msgs::byte*)realloc(this->data, data_lengthT * sizeof(std_msgs::byte));
+      offset += 3;
+      data_length = data_lengthT;
+      for( uint8_t i = 0; i < data_length; i++){
+      offset += this->st_data.deserialize(inbuffer + offset);
+        memcpy( &(this->data[i]), &(this->st_data), sizeof(std_msgs::byte));
+      }
+     return offset;
+    }
+
+    virtual const char * getType(){ return "std_msgs/ByteMultiArray"; };
+    virtual const char * getMD5(){ return "70ea476cbcfd65ac2f68f3cda1e891fe"; };
+
+  };
+
+}
 #endif
\ No newline at end of file