Diff: std_msgs/UInt16.h

Revision:

3:1cf99502f396

Parent:

1:ff0ec969dad1

--- a/std_msgs/UInt16.h	Sun Oct 16 09:35:11 2011 +0000
+++ b/std_msgs/UInt16.h	Sat Nov 12 23:54:45 2011 +0000
@@ -1,51 +1,41 @@
-#ifndef ros_UInt16_h
-#define ros_UInt16_h
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "../ros/msg.h"
-
-namespace std_msgs
-{
-
-  class UInt16 : public ros::Msg
-  {
-    public:
-      uint16_t data;
-
-    virtual int serialize(unsigned char *outbuffer)
-    {
-      int offset = 0;
-      union {
-        uint16_t real;
-        uint16_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;
-      offset += sizeof(this->data);
-      return offset;
-    }
-
-    virtual int deserialize(unsigned char *inbuffer)
-    {
-      int offset = 0;
-      union {
-        uint16_t real;
-        uint16_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);
-      this->data = u_data.real;
-      offset += sizeof(this->data);
-     return offset;
-    }
-
-    virtual const char * getType(){ return "std_msgs/UInt16"; };
-
-  };
-
-}
+#ifndef _ROS_std_msgs_UInt16_h
+#define _ROS_std_msgs_UInt16_h
+
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include "ros/msg.h"
+
+namespace std_msgs
+{
+
+  class UInt16 : public ros::Msg
+  {
+    public:
+      uint16_t data;
+
+    virtual int serialize(unsigned char *outbuffer) const
+    {
+      int offset = 0;
+      *(outbuffer + offset + 0) = (this->data >> (8 * 0)) & 0xFF;
+      *(outbuffer + offset + 1) = (this->data >> (8 * 1)) & 0xFF;
+      offset += sizeof(this->data);
+      return offset;
+    }
+
+    virtual int deserialize(unsigned char *inbuffer)
+    {
+      int offset = 0;
+      this->data |= ((uint16_t) (*(inbuffer + offset + 0))) << (8 * 0);
+      this->data |= ((uint16_t) (*(inbuffer + offset + 1))) << (8 * 1);
+      offset += sizeof(this->data);
+     return offset;
+    }
+
+    virtual const char * getType(){ return "std_msgs/UInt16"; };
+    virtual const char * getMD5(){ return "1df79edf208b629fe6b81923a544552d"; };
+
+  };
+
+}
 #endif
\ No newline at end of file