summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2007-02-01 12:53:26 +0000
committerfcolin2007-02-01 12:53:26 +0000
commitc5851089facb6bcc36b736d21efd9941941667c3 (patch)
tree20311c7d168608127745f382e4520e2ebdbe0cc7
parent30797436d86f3cd922fca6f53536c6805e8d321d (diff)
downloadivy-cplusplus-c5851089facb6bcc36b736d21efd9941941667c3.zip
ivy-cplusplus-c5851089facb6bcc36b736d21efd9941941667c3.tar.gz
ivy-cplusplus-c5851089facb6bcc36b736d21efd9941941667c3.tar.bz2
ivy-cplusplus-c5851089facb6bcc36b736d21efd9941941667c3.tar.xz
Utilisateur : Fcolin Date : 31/01/01 Heure : 11:18 Archivé dans $/Ivy (vss 4)
-rw-r--r--Ivy/BufferedSocket.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/Ivy/BufferedSocket.cxx b/Ivy/BufferedSocket.cxx
index d19b68f..63fd6c0 100644
--- a/Ivy/BufferedSocket.cxx
+++ b/Ivy/BufferedSocket.cxx
@@ -69,7 +69,7 @@ void CBufferedSocket::OnReceive(int nErrorCode)
}
ptr += nb;
- assert ( ptr < (buf +sizeof( buf )));
+ ASSERT( ptr < (buf +sizeof( buf )));
*ptr = '\0';
ptr = buf;
while( (ptr_nl = strchr( ptr, '\n' )))
@@ -101,8 +101,8 @@ void CBufferedSocket::SetSeparator( char sep )
}
void CBufferedSocket::OnWakeup()
{
- String msg;
- BOOL empty;
+ string msg;
+ bool empty;
try
{
// on essaye de garder la section critique a l'interieur de la boucle
@@ -134,7 +134,7 @@ void CBufferedSocket::OnWakeup()
//buf_out.push_front( msg);
//LeaveCriticalSection( &m_CritSection );
}
- else TRACE("CBufferedSocket::OnWakeup error %d Sending buffer %s \n",err,msg.c_str());
+ else TRACE("CBufferedSocket::OnWakeup error %d Sending buffer %s \n",err,msg);
}
@@ -154,12 +154,12 @@ void CBufferedSocket::Send ( const char * data )
//BOOL toBeSignaled;
EnterCriticalSection( &m_CritSection );
//toBeSignaled = buf_out.IsEmpty() && connected;
- buf_out.push_back( String(data) );
+ buf_out.push_back( string(data) );
LeaveCriticalSection( &m_CritSection );
//TRACE("CBufferedSocket::Send Adding buffer to send count %d\n",buf_out.size());
if ( connected )
{
- BOOL ok = WSASetEvent( m_hEvent[1] );
- if ( !ok ) TRACE( "CBufferedSocket::Send Error SetEvent %d\n", WSAGetLastError());
+// BOOL ok = WSASetEvent( m_hEvent[1] );
+// if ( !ok ) TRACE( "CBufferedSocket::Send Error SetEvent %d\n", WSAGetLastError());
}
}