Diff: std_msgs/UInt64MultiArray.h

Revision:

5:c30c76e8c3f1

Parent:

3:1cf99502f396

--- a/std_msgs/UInt64MultiArray.h	Wed Feb 29 23:00:21 2012 +0000
+++ b/std_msgs/UInt64MultiArray.h	Thu May 08 06:34:18 2014 +0000
@@ -12,69 +12,63 @@
 
   class UInt64MultiArray : public ros::Msg
   {
-public:
-    std_msgs::MultiArrayLayout layout;
-    unsigned char data_length;
-    uint64_t st_data;
-    uint64_t * data;
+    public:
+      std_msgs::MultiArrayLayout layout;
+      uint8_t data_length;
+      uint64_t st_data;
+      uint64_t * 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 ( unsigned char i = 0; i < data_length; i++) {
-            union {
-                uint64_t real;
-                uint64_t base;
-            } u_datai;
-            u_datai.real = this->data[i];
-            *(outbuffer + offset + 0) = (u_datai.base >> (8 * 0)) & 0xFF;
-            *(outbuffer + offset + 1) = (u_datai.base >> (8 * 1)) & 0xFF;
-            *(outbuffer + offset + 2) = (u_datai.base >> (8 * 2)) & 0xFF;
-            *(outbuffer + offset + 3) = (u_datai.base >> (8 * 3)) & 0xFF;
-            *(outbuffer + offset + 4) = (u_datai.base >> (8 * 4)) & 0xFF;
-            *(outbuffer + offset + 5) = (u_datai.base >> (8 * 5)) & 0xFF;
-            *(outbuffer + offset + 6) = (u_datai.base >> (8 * 6)) & 0xFF;
-            *(outbuffer + offset + 7) = (u_datai.base >> (8 * 7)) & 0xFF;
-            offset += sizeof(this->data[i]);
-        }
-        return offset;
+    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++){
+      union {
+        uint64_t real;
+        uint32_t base;
+      } u_datai;
+      u_datai.real = this->data[i];
+      *(outbuffer + offset + 0) = (u_datai.base >> (8 * 0)) & 0xFF;
+      *(outbuffer + offset + 1) = (u_datai.base >> (8 * 1)) & 0xFF;
+      *(outbuffer + offset + 2) = (u_datai.base >> (8 * 2)) & 0xFF;
+      *(outbuffer + offset + 3) = (u_datai.base >> (8 * 3)) & 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 = (uint64_t*)realloc(this->data, data_lengthT * sizeof(uint64_t));
-        offset += 3;
-        data_length = data_lengthT;
-        for ( unsigned char i = 0; i < data_length; i++) {
-            union {
-                uint64_t real;
-                uint64_t base;
-            } u_st_data;
-            u_st_data.base = 0;
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 3))) << (8 * 3);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 4))) << (8 * 4);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 5))) << (8 * 5);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 6))) << (8 * 6);
-            u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 7))) << (8 * 7);
-            this->st_data = u_st_data.real;
-            offset += sizeof(this->st_data);
-            memcpy( &(this->data[i]), &(this->st_data), sizeof(uint64_t));
-        }
-        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 = (uint64_t*)realloc(this->data, data_lengthT * sizeof(uint64_t));
+      offset += 3;
+      data_length = data_lengthT;
+      for( uint8_t i = 0; i < data_length; i++){
+      union {
+        uint64_t real;
+        uint32_t base;
+      } u_st_data;
+      u_st_data.base = 0;
+      u_st_data.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_st_data.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_st_data.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_st_data.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
+      this->st_data = u_st_data.real;
+      offset += sizeof(this->st_data);
+        memcpy( &(this->data[i]), &(this->st_data), sizeof(uint64_t));
+      }
+     return offset;
     }
 
-    virtual const char * getType(){ return "std_msgs/UInt64MultiArray"; };
-    virtual const char * getMD5(){ return "6088f127afb1d6c72927aa1247e945af"; };
+    const char * getType(){ return "std_msgs/UInt64MultiArray"; };
+    const char * getMD5(){ return "6088f127afb1d6c72927aa1247e945af"; };
 
   };