[asycxx-devel] SF.net SVN: asycxx:[63] trunk

[<fj...@us...>]

Revision: 63
          http://asycxx.svn.sourceforge.net/asycxx/?rev=63&view=rev
Author:   fjosh
Date:     2009-05-04 14:29:08 +0000 (Mon, 04 May 2009)

Log Message:
-----------
Fixed amd64 build issues

Modified Paths:
--------------
    trunk/include/asycxx/RawCANTransport.h
    trunk/src/DataBuffer.cxx
    trunk/src/GimpleMsgBus.cxx

Modified: trunk/include/asycxx/RawCANTransport.h
===================================================================
--- trunk/include/asycxx/RawCANTransport.h	2009-04-25 10:23:03 UTC (rev 62)
+++ trunk/include/asycxx/RawCANTransport.h	2009-05-04 14:29:08 UTC (rev 63)
@@ -14,6 +14,7 @@
 #ifndef __HIPRO_ASYCXX__CAN_TRANSPORT_H__
 #define __HIPRO_ASYCXX__CAN_TRANSPORT_H__
 
+#include <stdint.h>
 
 #include "Error.h"
 #include "Reactor.h"

Modified: trunk/src/DataBuffer.cxx
===================================================================
--- trunk/src/DataBuffer.cxx	2009-04-25 10:23:03 UTC (rev 62)
+++ trunk/src/DataBuffer.cxx	2009-05-04 14:29:08 UTC (rev 63)
@@ -141,7 +141,7 @@
   if (m_ProcessedLen == m_DataLen) { return NULL; }
 
   /* compute the new pointer and return it */
-  ptr = (void *)((unsigned int)m_Data + m_ProcessedLen);
+  ptr = (void *)((unsigned char *)m_Data + m_ProcessedLen);
   return ptr;
 }
 

Modified: trunk/src/GimpleMsgBus.cxx
===================================================================
--- trunk/src/GimpleMsgBus.cxx	2009-04-25 10:23:03 UTC (rev 62)
+++ trunk/src/GimpleMsgBus.cxx	2009-05-04 14:29:08 UTC (rev 63)
@@ -89,7 +89,7 @@
               getTransport()->loseConnection ();
               return;
             }
-          data_ptr = (void *)((unsigned int)data_ptr + processed);
+          data_ptr = (void *)((unsigned char *)data_ptr + processed);
           dleft -= processed;
           break;
 
@@ -100,7 +100,7 @@
               getTransport()->loseConnection ();
               return;
             }
-          data_ptr = (void *)((unsigned int)data_ptr + processed);
+          data_ptr = (void *)((unsigned char *)data_ptr + processed);
           dleft -= processed;
           break;
         };
@@ -130,7 +130,7 @@
   else { to_copy = m_Hdr_left; }
 
   /* setup the pointers and do the copy */
-  dptr = (void *)((unsigned int)&m_Hdr + m_Hdr_filled);
+  dptr = (void *)((unsigned char *)&m_Hdr + m_Hdr_filled);
   memcpy (dptr, data_ptr, to_copy);
 
   m_Hdr_filled += to_copy;
@@ -148,7 +148,7 @@
       if (memcmp ((void *)&sign, (void *)&m_Hdr.signature, 4) != 0)
         {
           processed = 0;
-          ERR ("bad signature in header '%c', '%c', '%c', %c", m_Hdr.signature[0],
+          ERR ("bad signature in header '%c','%c','%c',%c", m_Hdr.signature[0],
                m_Hdr.signature[1], m_Hdr.signature[2], m_Hdr.signature[3]);
           return RetCode_Error;
         }
@@ -189,7 +189,7 @@
   else { to_copy = m_Payload_left; }
 
   /* setup the pointers and do the copy */
-  dptr = (void *)((unsigned int)m_Payload->Data() + m_Payload_filled);
+  dptr = (void *)((unsigned char *)m_Payload->Data() + m_Payload_filled);
   memcpy (dptr, data_ptr, to_copy);
 
   m_Payload_filled += to_copy;
@@ -235,7 +235,8 @@
   pkt->Len (pkt_len);
 
   GMBPacketHdr_s *pktHdr = (GMBPacketHdr_s *) pkt->Data();
-  void *data = (void *)((unsigned int)pktHdr + sizeof (struct GMBPacketHdr_s));
+  void *data = (void *)((unsigned char *)pktHdr + 
+                        sizeof(struct GMBPacketHdr_s));
   
   /* construct the packet */
   pktHdr->signature[0] = 'G';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.