Diff: nav_msgs/GridCells.h

Revision:

3:1cf99502f396

Parent:

1:ff0ec969dad1

--- a/nav_msgs/GridCells.h	Sun Oct 16 09:35:11 2011 +0000
+++ b/nav_msgs/GridCells.h	Sat Nov 12 23:54:45 2011 +0000
@@ -1,10 +1,10 @@
-#ifndef ros_nav_msgs_GridCells_h
-#define ros_nav_msgs_GridCells_h
+#ifndef _ROS_nav_msgs_GridCells_h
+#define _ROS_nav_msgs_GridCells_h
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../ros/msg.h"
+#include "ros/msg.h"
 #include "std_msgs/Header.h"
 #include "geometry_msgs/Point.h"
 
@@ -17,17 +17,17 @@
       std_msgs::Header header;
       float cell_width;
       float cell_height;
-      unsigned char cells_length;
+      uint8_t cells_length;
       geometry_msgs::Point st_cells;
       geometry_msgs::Point * cells;
 
-    virtual int serialize(unsigned char *outbuffer)
+    virtual int serialize(unsigned char *outbuffer) const
     {
       int offset = 0;
       offset += this->header.serialize(outbuffer + offset);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_cell_width;
       u_cell_width.real = this->cell_width;
       *(outbuffer + offset + 0) = (u_cell_width.base >> (8 * 0)) & 0xFF;
@@ -37,7 +37,7 @@
       offset += sizeof(this->cell_width);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_cell_height;
       u_cell_height.real = this->cell_height;
       *(outbuffer + offset + 0) = (u_cell_height.base >> (8 * 0)) & 0xFF;
@@ -49,7 +49,7 @@
       *(outbuffer + offset++) = 0;
       *(outbuffer + offset++) = 0;
       *(outbuffer + offset++) = 0;
-      for( unsigned char i = 0; i < cells_length; i++){
+      for( uint8_t i = 0; i < cells_length; i++){
       offset += this->cells[i].serialize(outbuffer + offset);
       }
       return offset;
@@ -61,39 +61,40 @@
       offset += this->header.deserialize(inbuffer + offset);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_cell_width;
       u_cell_width.base = 0;
-      u_cell_width.base |= ((typeof(u_cell_width.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_cell_width.base |= ((typeof(u_cell_width.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_cell_width.base |= ((typeof(u_cell_width.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_cell_width.base |= ((typeof(u_cell_width.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_cell_width.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_cell_width.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_cell_width.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_cell_width.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->cell_width = u_cell_width.real;
       offset += sizeof(this->cell_width);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_cell_height;
       u_cell_height.base = 0;
-      u_cell_height.base |= ((typeof(u_cell_height.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_cell_height.base |= ((typeof(u_cell_height.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_cell_height.base |= ((typeof(u_cell_height.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_cell_height.base |= ((typeof(u_cell_height.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_cell_height.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_cell_height.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_cell_height.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_cell_height.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->cell_height = u_cell_height.real;
       offset += sizeof(this->cell_height);
-      unsigned char cells_lengthT = *(inbuffer + offset++);
+      uint8_t cells_lengthT = *(inbuffer + offset++);
       if(cells_lengthT > cells_length)
         this->cells = (geometry_msgs::Point*)realloc(this->cells, cells_lengthT * sizeof(geometry_msgs::Point));
       offset += 3;
       cells_length = cells_lengthT;
-      for( unsigned char i = 0; i < cells_length; i++){
+      for( uint8_t i = 0; i < cells_length; i++){
       offset += this->st_cells.deserialize(inbuffer + offset);
         memcpy( &(this->cells[i]), &(this->st_cells), sizeof(geometry_msgs::Point));
       }
      return offset;
     }
 
-   virtual const char * getType(){ return "nav_msgs/GridCells"; };
+    virtual const char * getType(){ return "nav_msgs/GridCells"; };
+    virtual const char * getMD5(){ return "b9e4f5df6d28e272ebde00a3994830f5"; };
 
   };