diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2001-12-27 18:38:22 +0000 |
| commit | ca2b7f71b4133faf486a677b3744904c0f759471 (patch) | |
| tree | 2ea5e06f611c338f8160a0c3bd36d069118926fe /cpp/src/Ice/Network.cpp | |
| parent | file run.py was initially added on branch IceThread. (diff) | |
| download | ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.bz2 ice-ca2b7f71b4133faf486a677b3744904c0f759471.tar.xz ice-ca2b7f71b4133faf486a677b3744904c0f759471.zip | |
IceThread merge.
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index e3f7b1802f0..f2f13b0d626 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -570,7 +570,7 @@ repeatAccept: return ret; } -static JTCMutex getHostByNameMutex; +static IceUtil::Mutex getHostByNameMutex; void IceInternal::getAddress(const char* host, int port, struct sockaddr_in& addr) @@ -582,7 +582,7 @@ IceInternal::getAddress(const char* host, int port, struct sockaddr_in& addr) if (addr.sin_addr.s_addr == INADDR_NONE) { - JTCSyncT<JTCMutex> sync(getHostByNameMutex); + IceUtil::Mutex::Lock sync(getHostByNameMutex); struct hostent* entry; int retry = 5; @@ -624,7 +624,7 @@ IceInternal::getLocalAddress(int port, struct sockaddr_in& addr) addr.sin_port = htons(port); { - JTCSyncT<JTCMutex> sync(getHostByNameMutex); + IceUtil::Mutex::Lock sync(getHostByNameMutex); struct hostent* entry; int retry = 5; @@ -662,7 +662,7 @@ IceInternal::getLocalHost(bool numeric) } { - JTCSyncT<JTCMutex> sync(getHostByNameMutex); + IceUtil::Mutex::Lock sync(getHostByNameMutex); struct hostent* entry; int retry = 5; @@ -994,7 +994,7 @@ IceInternal::lastErrorToStringDNS() #endif } -static JTCMutex inetNtoaMutex; +static IceUtil::Mutex inetNtoaMutex; std::string IceInternal::fdToString(SOCKET fd) @@ -1035,7 +1035,7 @@ IceInternal::fdToString(SOCKET fd) ostringstream s; { - JTCSyncT<JTCMutex> sync(inetNtoaMutex); + IceUtil::Mutex::Lock sync(inetNtoaMutex); s << "local address = " << inet_ntoa(localAddr.sin_addr) << ':' << ntohs(localAddr.sin_port); if (peerNotConnected) @@ -1054,7 +1054,7 @@ IceInternal::fdToString(SOCKET fd) std::string IceInternal::addrToString(const struct sockaddr_in& addr) { - JTCSyncT<JTCMutex> sync(inetNtoaMutex); + IceUtil::Mutex::Lock sync(inetNtoaMutex); ostringstream s; s << inet_ntoa(addr.sin_addr) << ':' << ntohs(addr.sin_port); return s.str(); |