diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-10 08:49:45 +0200 |
| commit | 981d2ac7c8f825f92670f9121a7d29edd94da6f9 (patch) | |
| tree | 286f13f365513c9894c0ec4167b8bbef30965bf9 /cpp/src/Ice/Network.cpp | |
| parent | Fixed communicator flushBatchRequests to allow tracing (diff) | |
| parent | Fixed ICE-4863 (IceProxy::Ice::Object derives privately from Mutex) + a few w... (diff) | |
| download | ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.bz2 ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.tar.xz ice-981d2ac7c8f825f92670f9121a7d29edd94da6f9.zip | |
Merge remote-tracking branch 'origin/encoding11' into withoutsync
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 9ab03d9827c..84474c61bac 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -64,10 +64,6 @@ using namespace Windows::Networking; using namespace Windows::Networking::Sockets; #endif -#if defined(__sun) && !defined(__GNUC__) -# define INADDR_NONE (in_addr_t)0xffffffff -#endif - namespace { @@ -1128,11 +1124,11 @@ IceInternal::inetAddrToString(const Address& ss) int size = 0; if(ss.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(ss.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { @@ -1141,7 +1137,7 @@ IceInternal::inetAddrToString(const Address& ss) char namebuf[1024]; namebuf[0] = '\0'; - getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, sizeof(namebuf), 0, 0, NI_NUMERICHOST); + getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, static_cast<socklen_t>(sizeof(namebuf)), 0, 0, NI_NUMERICHOST); return string(namebuf); #else if(ss.host == nullptr) @@ -1626,11 +1622,11 @@ IceInternal::doBind(SOCKET fd, const Address& addr) int size; if(addr.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(addr.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { @@ -1842,11 +1838,11 @@ repeatConnect: int size; if(addr.ss_family == AF_INET) { - size = sizeof(sockaddr_in); + size = static_cast<int>(sizeof(sockaddr_in)); } else if(addr.ss_family == AF_INET6) { - size = sizeof(sockaddr_in6); + size = static_cast<int>(sizeof(sockaddr_in6)); } else { |