From 8b15e6ba73a45b5be5064cb2f866ad0654d7af18 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Mon, 2 Mar 2009 15:23:53 -0330
Subject: C++Builder 2009 port

---
 cpp/src/Ice/Network.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'cpp/src/Ice/Network.cpp')

diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 45b319ce246..7ed2a41e86a 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -77,7 +77,7 @@ getLocalAddresses(ProtocolSupport protocol)
             vector<unsigned char> buffer;
             buffer.resize(1024);
             unsigned long len = 0;
-            DWORD rs = WSAIoctl(fd, SIO_ADDRESS_LIST_QUERY, 0, 0,
+            int rs = WSAIoctl(fd, SIO_ADDRESS_LIST_QUERY, 0, 0,
                                 &buffer[0], static_cast<DWORD>(buffer.size()),
                                 &len, 0, 0);
             if(rs == SOCKET_ERROR)
@@ -883,7 +883,8 @@ IceInternal::getSendBufferSize(SOCKET fd)
 {
     int sz;
     socklen_t len = sizeof(sz);
-    if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&sz, &len) == SOCKET_ERROR || len != sizeof(sz))
+    if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&sz, &len) == SOCKET_ERROR || 
+       static_cast<unsigned int>(len) != sizeof(sz))
     {
         closeSocketNoThrow(fd);
         SocketException ex(__FILE__, __LINE__);
@@ -910,7 +911,8 @@ IceInternal::getRecvBufferSize(SOCKET fd)
 {
     int sz;
     socklen_t len = sizeof(sz);
-    if(getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&sz, &len) == SOCKET_ERROR || len != sizeof(sz))
+    if(getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&sz, &len) == SOCKET_ERROR || 
+       static_cast<unsigned int>(len) != sizeof(sz))
     {
         closeSocketNoThrow(fd);
         SocketException ex(__FILE__, __LINE__);
-- 
cgit v1.2.3


From 1a8cef0364ca85f5c1b2e1d8b13a21caf31d08fb Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Wed, 11 Mar 2009 10:32:05 +0100
Subject: Fixed self-connect check again

---
 cpp/src/Ice/Network.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cpp/src/Ice/Network.cpp')

diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 7ed2a41e86a..1643354f167 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -1244,7 +1244,7 @@ IceInternal::doFinishConnect(SOCKET fd)
     struct sockaddr_storage localAddr;
     fdToLocalAddress(fd, localAddr);
     struct sockaddr_storage remoteAddr;
-    if(!fdToRemoteAddress(fd, remoteAddr) && compareAddress(remoteAddr, localAddr) == 0)
+    if(fdToRemoteAddress(fd, remoteAddr) && compareAddress(remoteAddr, localAddr) == 0)
     {
         ConnectionRefusedException ex(__FILE__, __LINE__);
         ex.error = 0; // No appropriate errno
-- 
cgit v1.2.3