AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no changes, just removed broken #if 0'd out code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-07-12 02:17:11 +00:00
parent dde65a6040
commit 74a50e4923
1 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/common/sckstrm.cpp
View File

@ -44,32 +44,6 @@ size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount(); size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR; m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
return ret; return ret;
// Patch 1476893 caused Advise to hang, needs further investigation
#if 0
const char *buf = (const char *)buffer;
size_t count = 0;
while ( count < size && m_o_socket->WaitForWrite() )
{
const size_t ret = m_o_socket->Write(buf, size - count).LastCount();
buf += ret;
count += ret;
if ( m_o_socket->Error() )
{
if (m_o_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
m_lasterror = wxSTREAM_WRITE_ERROR;
return count;
}
}
}
m_lasterror = wxSTREAM_NO_ERROR;
return count;
#endif
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -90,32 +64,6 @@ size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
size_t ret = m_i_socket->Read((char *)buffer, size).LastCount(); size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR; m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
return ret; return ret;
// Patch 1476893 caused Advise to hang, needs further investigation
#if 0
char *buf = (char *)buffer;
size_t count = 0;
while ( count < size && m_i_socket->WaitForRead() )
{
const size_t ret = m_i_socket->Read(buf, size - count).LastCount();
buf += ret;
count += ret;
if ( m_i_socket->Error() )
{
if (m_i_socket->LastError() != wxSOCKET_WOULDBLOCK)
{
m_lasterror = wxSTREAM_READ_ERROR;
return count;
}
}
}
m_lasterror = wxSTREAM_NO_ERROR;
return count;
#endif
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@ -131,5 +79,4 @@ wxSocketStream::~wxSocketStream()
{ {
} }
#endif #endif // wxUSE_STREAMS && wxUSE_SOCKETS
// wxUSE_STREAMS && wxUSE_SOCKETS