diff options
| -rw-r--r-- | Ivy/BufferedSocket.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Ivy/BufferedSocket.cxx b/Ivy/BufferedSocket.cxx index 5f6c994..cae2404 100644 --- a/Ivy/BufferedSocket.cxx +++ b/Ivy/BufferedSocket.cxx @@ -70,7 +70,7 @@ void CBufferedSocket::OnReceive(int nErrorCode) }
current_ptr += nb;
- ASSERT( current_ptr < (buffer + buffer_size) );
+ //ASSERT( current_ptr < (buffer + buffer_size) );
ptr = buffer;
while ((ptr_sep = (char*)memchr (ptr, separator, current_ptr - ptr )))
{
@@ -102,7 +102,7 @@ void CBufferedSocket::SetSeparator( char sep ) }
void CBufferedSocket::OnSend( int nErrorCode )
{
- string msg;
+ ivy::string msg;
bool empty;
// on essaye de garder la section critique a l'interieur de la boucle
@@ -154,7 +154,7 @@ 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( ivy::string(data) );
LeaveCriticalSection( &m_CritSection );
//TRACE("CBufferedSocket::Send Adding buffer to send count %d\n",buf_out.size());
// if ( connected )
|