Diff: sensor_msgs/Range.h

Revision:

3:1cf99502f396

Parent:

0:77afd7560544

--- a/sensor_msgs/Range.h	Sun Oct 16 09:35:11 2011 +0000
+++ b/sensor_msgs/Range.h	Sat Nov 12 23:54:45 2011 +0000
@@ -1,10 +1,10 @@
-#ifndef ros_Range_h
-#define ros_Range_h
+#ifndef _ROS_sensor_msgs_Range_h
+#define _ROS_sensor_msgs_Range_h
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include "../ros/msg.h"
+#include "ros/msg.h"
 #include "std_msgs/Header.h"
 
 namespace sensor_msgs
@@ -14,7 +14,7 @@
   {
     public:
       std_msgs::Header header;
-      unsigned char radiation_type;
+      uint8_t radiation_type;
       float field_of_view;
       float min_range;
       float max_range;
@@ -22,20 +22,15 @@
       enum { ULTRASOUND = 0 };
       enum { INFRARED = 1 };
 
-    virtual int serialize(unsigned char *outbuffer)
+    virtual int serialize(unsigned char *outbuffer) const
     {
       int offset = 0;
       offset += this->header.serialize(outbuffer + offset);
-      union {
-        unsigned char real;
-        unsigned char base;
-      } u_radiation_type;
-      u_radiation_type.real = this->radiation_type;
-      *(outbuffer + offset + 0) = (u_radiation_type.base >> (8 * 0)) & 0xFF;
+      *(outbuffer + offset + 0) = (this->radiation_type >> (8 * 0)) & 0xFF;
       offset += sizeof(this->radiation_type);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_field_of_view;
       u_field_of_view.real = this->field_of_view;
       *(outbuffer + offset + 0) = (u_field_of_view.base >> (8 * 0)) & 0xFF;
@@ -45,7 +40,7 @@
       offset += sizeof(this->field_of_view);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_min_range;
       u_min_range.real = this->min_range;
       *(outbuffer + offset + 0) = (u_min_range.base >> (8 * 0)) & 0xFF;
@@ -55,7 +50,7 @@
       offset += sizeof(this->min_range);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_max_range;
       u_max_range.real = this->max_range;
       *(outbuffer + offset + 0) = (u_max_range.base >> (8 * 0)) & 0xFF;
@@ -65,7 +60,7 @@
       offset += sizeof(this->max_range);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_range;
       u_range.real = this->range;
       *(outbuffer + offset + 0) = (u_range.base >> (8 * 0)) & 0xFF;
@@ -80,62 +75,57 @@
     {
       int offset = 0;
       offset += this->header.deserialize(inbuffer + offset);
-      union {
-        unsigned char real;
-        unsigned char base;
-      } u_radiation_type;
-      u_radiation_type.base = 0;
-      u_radiation_type.base |= ((typeof(u_radiation_type.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      this->radiation_type = u_radiation_type.real;
+      this->radiation_type |= ((uint8_t) (*(inbuffer + offset + 0))) << (8 * 0);
       offset += sizeof(this->radiation_type);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_field_of_view;
       u_field_of_view.base = 0;
-      u_field_of_view.base |= ((typeof(u_field_of_view.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_field_of_view.base |= ((typeof(u_field_of_view.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_field_of_view.base |= ((typeof(u_field_of_view.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_field_of_view.base |= ((typeof(u_field_of_view.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_field_of_view.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_field_of_view.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_field_of_view.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_field_of_view.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->field_of_view = u_field_of_view.real;
       offset += sizeof(this->field_of_view);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_min_range;
       u_min_range.base = 0;
-      u_min_range.base |= ((typeof(u_min_range.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_min_range.base |= ((typeof(u_min_range.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_min_range.base |= ((typeof(u_min_range.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_min_range.base |= ((typeof(u_min_range.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_min_range.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_min_range.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_min_range.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_min_range.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->min_range = u_min_range.real;
       offset += sizeof(this->min_range);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_max_range;
       u_max_range.base = 0;
-      u_max_range.base |= ((typeof(u_max_range.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_max_range.base |= ((typeof(u_max_range.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_max_range.base |= ((typeof(u_max_range.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_max_range.base |= ((typeof(u_max_range.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_max_range.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_max_range.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_max_range.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_max_range.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->max_range = u_max_range.real;
       offset += sizeof(this->max_range);
       union {
         float real;
-        unsigned long base;
+        uint32_t base;
       } u_range;
       u_range.base = 0;
-      u_range.base |= ((typeof(u_range.base)) (*(inbuffer + offset + 0))) << (8 * 0);
-      u_range.base |= ((typeof(u_range.base)) (*(inbuffer + offset + 1))) << (8 * 1);
-      u_range.base |= ((typeof(u_range.base)) (*(inbuffer + offset + 2))) << (8 * 2);
-      u_range.base |= ((typeof(u_range.base)) (*(inbuffer + offset + 3))) << (8 * 3);
+      u_range.base |= ((uint32_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      u_range.base |= ((uint32_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      u_range.base |= ((uint32_t) (*(inbuffer + offset + 2))) << (8 * 2);
+      u_range.base |= ((uint32_t) (*(inbuffer + offset + 3))) << (8 * 3);
       this->range = u_range.real;
       offset += sizeof(this->range);
      return offset;
     }
 
     virtual const char * getType(){ return "sensor_msgs/Range"; };
+    virtual const char * getMD5(){ return "c005c34273dc426c67a020a87bc24148"; };
 
   };