Diff: std_msgs/UInt64.h

Revision:

5:c30c76e8c3f1

Parent:

3:1cf99502f396

--- a/std_msgs/UInt64.h	Wed Feb 29 23:00:21 2012 +0000
+++ b/std_msgs/UInt64.h	Thu May 08 06:34:18 2014 +0000
@@ -6,59 +6,51 @@
 #include <stdlib.h>
 #include "ros/msg.h"
 
-namespace std_msgs {
+namespace std_msgs
+{
 
-class UInt64 : public ros::Msg {
-public:
-    uint64_t data;
+  class UInt64 : public ros::Msg
+  {
+    public:
+      uint64_t data;
 
-    virtual int serialize(unsigned char *outbuffer) const {
-        int offset = 0;
-        union {
-            uint64_t real;
-            uint64_t base;
-        } u_data;
-        u_data.real = this->data;
-        *(outbuffer + offset + 0) = (u_data.base >> (8 * 0)) & 0xFF;
-        *(outbuffer + offset + 1) = (u_data.base >> (8 * 1)) & 0xFF;
-        *(outbuffer + offset + 2) = (u_data.base >> (8 * 2)) & 0xFF;
-        *(outbuffer + offset + 3) = (u_data.base >> (8 * 3)) & 0xFF;
-        *(outbuffer + offset + 4) = (u_data.base >> (8 * 4)) & 0xFF;
-        *(outbuffer + offset + 5) = (u_data.base >> (8 * 5)) & 0xFF;
-        *(outbuffer + offset + 6) = (u_data.base >> (8 * 6)) & 0xFF;
-        *(outbuffer + offset + 7) = (u_data.base >> (8 * 7)) & 0xFF;
-        offset += sizeof(this->data);
-        return offset;
+    virtual int serialize(unsigned char *outbuffer) const
+    {
+      int offset = 0;
+      union {
+        uint64_t real;
+        uint32_t base;
+      } u_data;
+      u_data.real = this->data;
+      *(outbuffer + offset + 0) = (u_data.base >> (8 * 0)) & 0xFF;
+      *(outbuffer + offset + 1) = (u_data.base >> (8 * 1)) & 0xFF;
+      *(outbuffer + offset + 2) = (u_data.base >> (8 * 2)) & 0xFF;
+      *(outbuffer + offset + 3) = (u_data.base >> (8 * 3)) & 0xFF;
+      offset += sizeof(this->data);
+      return offset;
     }
 
-    virtual int deserialize(unsigned char *inbuffer) {
-        int offset = 0;
-        union {
-            uint64_t real;
-            uint64_t base;
-        } u_data;
-        u_data.base = 0;
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 3))) << (8 * 3);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 4))) << (8 * 4);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 5))) << (8 * 5);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 6))) << (8 * 6);
-        u_data.base |= ((typeof(u_data.base)) (*(inbuffer + offset + 7))) << (8 * 7);
-        this->data = u_data.real;
-        offset += sizeof(this->data);
-        return offset;
+    virtual int deserialize(unsigned char *inbuffer)
+    {
+      int offset = 0;
+      union {
+        uint64_t real;
+        uint32_t base;
+      } u_data;
+      u_data.base = 0;
+      u_data.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_data.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_data.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_data.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
+      this->data = u_data.real;
+      offset += sizeof(this->data);
+     return offset;
     }
 
-    virtual const char * getType() {
-        return "std_msgs/UInt64";
-    };
-    virtual const char * getMD5() {
-        return "1b2a79973e8bf53d7b53acb71299cb57";
-    };
+    const char * getType(){ return "std_msgs/UInt64"; };
+    const char * getMD5(){ return "1b2a79973e8bf53d7b53acb71299cb57"; };
 
-};
+  };
 
 }
 #endif
\ No newline at end of file