diff options
author | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 11:26:14 +0000 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2006-02-20 11:26:14 +0000 |
commit | 41b8924d9e71bee2821ed9bfcdd0c95c44cac3e4 (patch) | |
tree | 928f35074d73921bf949d4a41a2005b28214c620 /cppe/src/TcpTransport/Transceiver.cpp | |
parent | More Win32 socket timeout fixes (diff) | |
download | ice-41b8924d9e71bee2821ed9bfcdd0c95c44cac3e4.tar.bz2 ice-41b8924d9e71bee2821ed9bfcdd0c95c44cac3e4.tar.xz ice-41b8924d9e71bee2821ed9bfcdd0c95c44cac3e4.zip |
More socket timeout fixes
Diffstat (limited to 'cppe/src/TcpTransport/Transceiver.cpp')
-rw-r--r-- | cppe/src/TcpTransport/Transceiver.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cppe/src/TcpTransport/Transceiver.cpp b/cppe/src/TcpTransport/Transceiver.cpp index f3bb4715748..37d29563021 100644 --- a/cppe/src/TcpTransport/Transceiver.cpp +++ b/cppe/src/TcpTransport/Transceiver.cpp @@ -91,7 +91,7 @@ IceInternal::Transceiver::shutdownReadWrite() } void -IceInternal::Transceiver::write(Buffer& buf, int timeout) +IceInternal::Transceiver::writeWithTimeout(Buffer& buf, int timeout) { Buffer::Container::difference_type packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i); @@ -202,7 +202,7 @@ IceInternal::Transceiver::write(Buffer& buf, int timeout) } void -IceInternal::Transceiver::read(Buffer& buf, int timeout) +IceInternal::Transceiver::readWithTimeout(Buffer& buf, int timeout) { assert(timeout != 0); @@ -338,9 +338,7 @@ IceInternal::Transceiver::Transceiver(const InstancePtr& instance, SOCKET fd, in _traceLevels(instance->traceLevels()), _logger(instance->logger()), _fd(fd), -#ifndef ICEE_USE_SELECT_FOR_TIMEOUTS _timeout(timeout), -#endif _desc(fdToString(fd)) #ifdef _WIN32 , _isPeerLocal(isPeerLocal(fd)) |