Diff: geometry_msgs/Point32.h

Revision:

3:1cf99502f396

Parent:

1:ff0ec969dad1

--- a/geometry_msgs/Point32.h	Sun Oct 16 09:35:11 2011 +0000
+++ b/geometry_msgs/Point32.h	Sat Nov 12 23:54:45 2011 +0000
@@ -1,10 +1,10 @@
-#ifndef ros_geometry_msgs_Point32_h
-#define ros_geometry_msgs_Point32_h
+#ifndef _ROS_geometry_msgs_Point32_h
+#define _ROS_geometry_msgs_Point32_h
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../ros/msg.h"
+#include "ros/msg.h"
 
 namespace geometry_msgs
 {
@@ -16,12 +16,12 @@
       float y;
       float z;
 
-    virtual int serialize(unsigned char *outbuffer)
+    virtual int serialize(unsigned char *outbuffer) const
     {
       int offset = 0;
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_x;
       u_x.real = this->x;
       *(outbuffer + offset + 0) = (u_x.base >> (8 * 0)) & 0xFF;
@@ -31,7 +31,7 @@
       offset += sizeof(this->x);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_y;
       u_y.real = this->y;
       *(outbuffer + offset + 0) = (u_y.base >> (8 * 0)) & 0xFF;
@@ -41,7 +41,7 @@
       offset += sizeof(this->y);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_z;
       u_z.real = this->z;
       *(outbuffer + offset + 0) = (u_z.base >> (8 * 0)) & 0xFF;
@@ -57,41 +57,42 @@
       int offset = 0;
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_x;
       u_x.base = 0;
-      u_x.base |= ((typeof(u_x.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_x.base |= ((typeof(u_x.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_x.base |= ((typeof(u_x.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_x.base |= ((typeof(u_x.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_x.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_x.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_x.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_x.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->x = u_x.real;
       offset += sizeof(this->x);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_y;
       u_y.base = 0;
-      u_y.base |= ((typeof(u_y.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_y.base |= ((typeof(u_y.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_y.base |= ((typeof(u_y.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_y.base |= ((typeof(u_y.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_y.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_y.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_y.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_y.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->y = u_y.real;
       offset += sizeof(this->y);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_z;
       u_z.base = 0;
-      u_z.base |= ((typeof(u_z.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_z.base |= ((typeof(u_z.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_z.base |= ((typeof(u_z.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_z.base |= ((typeof(u_z.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_z.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_z.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_z.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_z.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->z = u_z.real;
       offset += sizeof(this->z);
      return offset;
     }
 
     virtual const char * getType(){ return "geometry_msgs/Point32"; };
+    virtual const char * getMD5(){ return "cc153912f1453b708d221682bc23d9ac"; };
 
   };