activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r737035 - in /activemq/activemq-cpp/trunk/src/main/decaf/net: SocketInputStream.cpp TcpSocket.cpp
Date Fri, 23 Jan 2009 14:48:12 GMT
Author: tabish
Date: Fri Jan 23 06:48:12 2009
New Revision: 737035

URL: http://svn.apache.org/viewvc?rev=737035&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-219

Applied patch for Socket code on Solaris

Modified:
    activemq/activemq-cpp/trunk/src/main/decaf/net/SocketInputStream.cpp
    activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp

Modified: activemq/activemq-cpp/trunk/src/main/decaf/net/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/net/SocketInputStream.cpp?rev=737035&r1=737034&r2=737035&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/net/SocketInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/net/SocketInputStream.cpp Fri Jan 23 06:48:12
2009
@@ -27,6 +27,7 @@
 #ifdef HAVE_SYS_IOCTL_H
 #define BSD_COMP /* Get FIONREAD on Solaris2. */
 #include <sys/ioctl.h>
+#include <unistd.h>
 #endif
 
 // Pick up FIONREAD on Solaris 2.5.

Modified: activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp?rev=737035&r1=737034&r2=737035&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/src/main/decaf/net/TcpSocket.cpp Fri Jan 23 06:48:12 2009
@@ -29,14 +29,14 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 TcpSocket::TcpSocket() throw ( SocketException )
-  : socketHandle( INVALID_SOCKET_HANDLE ),
+  : socketHandle( static_cast< SocketHandle >(INVALID_SOCKET_HANDLE) ),
     inputStream( NULL ),
     outputStream( NULL ) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 TcpSocket::TcpSocket( SocketHandle socketHandle )
- :  socketHandle( INVALID_SOCKET_HANDLE ),
+ :  socketHandle( static_cast< SocketHandle >(INVALID_SOCKET_HANDLE) ),
     inputStream( NULL ),
     outputStream( NULL ) {
 



Mime
View raw message