summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Network.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-03-05 15:20:12 +0100
committerBenoit Foucher <benoit@zeroc.com>2012-03-05 15:20:12 +0100
commit279cc589ece5abaeb735974e799c809227e0aa83 (patch)
tree186204caab0ce3d9cf39a5f09736e6b750e95b67 /cpp/src/Ice/Network.h
parentFixed copy/paste error for reading replica cert CN property (diff)
downloadice-279cc589ece5abaeb735974e799c809227e0aa83.tar.bz2
ice-279cc589ece5abaeb735974e799c809227e0aa83.tar.xz
ice-279cc589ece5abaeb735974e799c809227e0aa83.zip
ICE-4793 - Fixes to prevent GCC shadow warnings and other minor fixes
Diffstat (limited to 'cpp/src/Ice/Network.h')
-rw-r--r--cpp/src/Ice/Network.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index ca764aadf7e..370401e5211 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -108,7 +108,7 @@ class ICE_API NativeInfo : virtual public IceUtil::Shared
{
public:
- NativeInfo(SOCKET fd = INVALID_SOCKET) : _fd(fd)
+ NativeInfo(SOCKET socketFd = INVALID_SOCKET) : _fd(socketFd)
{
}