From 1e6a694714985125f37bf67dc5d35fd76fc7a33f Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Fri, 26 Jul 2013 09:09:03 +0200 Subject: Revert "Fix to allow transceivers to read more data than requested." This reverts commit 9c4e79ce6760badf047568fd300fcbe3455f31b7. --- cpp/src/Ice/TcpTransceiver.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/Ice/TcpTransceiver.cpp') diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp index c29391fa9da..d82fafa17ce 100644 --- a/cpp/src/Ice/TcpTransceiver.cpp +++ b/cpp/src/Ice/TcpTransceiver.cpp @@ -46,7 +46,7 @@ IceInternal::TcpTransceiver::getAsyncInfo(SocketOperation status) #endif SocketOperation -IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, bool& hasMoreData) +IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) { try { @@ -93,7 +93,7 @@ IceInternal::TcpTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer, // // Try to read the response. // - if(read(readBuffer, hasMoreData)) + if(read(readBuffer)) { // // Read completed without blocking - fall through. @@ -268,7 +268,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf) } bool -IceInternal::TcpTransceiver::read(Buffer& buf, bool&) +IceInternal::TcpTransceiver::read(Buffer& buf) { // // It's impossible for packetSize to be more than an Int. -- cgit v1.2.3