From 09f42e141177524d8548463e31373ebafa1565d3 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 6 Feb 2013 09:20:10 +0000 Subject: [PATCH] From Stephan Huber, fixed for Windows 64bit build --- src/osgPlugins/osc/osc/OscOutboundPacketStream.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/osc/osc/OscOutboundPacketStream.h b/src/osgPlugins/osc/osc/OscOutboundPacketStream.h index cae5405b3..f11fd8a0e 100644 --- a/src/osgPlugins/osc/osc/OscOutboundPacketStream.h +++ b/src/osgPlugins/osc/osc/OscOutboundPacketStream.h @@ -66,8 +66,8 @@ public: class OutboundPacketStream{ public: - OutboundPacketStream( char *buffer, unsigned long capacity ); - ~OutboundPacketStream(); + OutboundPacketStream( char *buffer, unsigned long capacity ); + ~OutboundPacketStream(); void Clear(); @@ -96,7 +96,7 @@ public: OutboundPacketStream& operator<<( const InfinitumType& rhs ); OutboundPacketStream& operator<<( int32 rhs ); -#ifndef __x86_64__ +#if !(defined(__x86_64__) || defined(_M_X64)) OutboundPacketStream& operator<<( int rhs ) { *this << (int32)rhs; return *this; } #endif