Diff: std_msgs/UInt64MultiArray.h

Revision:

3:dff241b66f84

Parent:

1:098e75fd5ad2

diff -r 094e5153a559 -r dff241b66f84 std_msgs/UInt64MultiArray.h
--- a/std_msgs/UInt64MultiArray.h	Sun Oct 16 09:33:53 2011 +0000
+++ b/std_msgs/UInt64MultiArray.h	Sat Nov 12 23:53:04 2011 +0000
@@ -1,22 +1,24 @@
-#ifndef ros_UInt64MultiArray_h
-#define ros_UInt64MultiArray_h
+#ifndef _ROS_std_msgs_UInt64MultiArray_h
+#define _ROS_std_msgs_UInt64MultiArray_h
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../ros/msg.h"
+#include "ros/msg.h"
 #include "std_msgs/MultiArrayLayout.h"
 
-namespace std_msgs {
+namespace std_msgs
+{
 
-class UInt64MultiArray : public ros::Msg {
+  class UInt64MultiArray : public ros::Msg
+  {
 public:
     std_msgs::MultiArrayLayout layout;
     unsigned char data_length;
     uint64_t st_data;
     uint64_t * data;
 
-    virtual int serialize(unsigned char *outbuffer) {
+    virtual int serialize(unsigned char *outbuffer) const {
         int offset = 0;
         offset += this->layout.serialize(outbuffer + offset);
         *(outbuffer + offset++) = data_length;
@@ -70,60 +72,11 @@
         }
         return offset;
     }
-    /*
-      public:
-        std_msgs::MultiArrayLayout layout;
-        unsigned char data_length;
-        long st_data;
-        long * 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++){
-        *(outbuffer + offset++) = (data[i] >> (8 * 0)) & 0xFF;
-        *(outbuffer + offset++) = (data[i] >> (8 * 1)) & 0xFF;
-        *(outbuffer + offset++) = (data[i] >> (8 * 2)) & 0xFF;
-        *(outbuffer + offset++) = (data[i] >> (8 * 3)) & 0xFF;
-        *(outbuffer + offset++) = (data[i] > 0) ? 0: 255;
-        *(outbuffer + offset++) = (data[i] > 0) ? 0: 255;
-        *(outbuffer + offset++) = (data[i] > 0) ? 0: 255;
-        *(outbuffer + offset++) = (data[i] > 0) ? 0: 255;
-        }
-        return offset;
-      }
+    virtual const char * getType(){ return "std_msgs/UInt64MultiArray"; };
+    virtual const char * getMD5(){ return "6088f127afb1d6c72927aa1247e945af"; };
 
-      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 = (long*)realloc(this->data, data_lengthT * sizeof(long));
-        offset += 3;
-        data_length = data_lengthT;
-        for( unsigned char i = 0; i < data_length; i++){
-        st_data = 0;
-        st_data += ((long)(*(inbuffer + offset++))) >> (8 * 0);
-        st_data += ((long)(*(inbuffer + offset++))) >> (8 * 1);
-        st_data += ((long)(*(inbuffer + offset++))) >> (8 * 2);
-        st_data += ((long)(*(inbuffer + offset++))) >> (8 * 3);
-        offset += 4;
-          memcpy( &(this->data[i]), &(this->st_data), sizeof(long));
-        }
-       return offset;
-      }
-    */
-    virtual const char * getType() {
-        return "std_msgs/UInt64MultiArray";
-    };
-
-};
+  };
 
 }
 #endif
\ No newline at end of file