From 3f1fdf4ac06e82a9e7e4e4a5d88f4c85b5f121d6 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 12:53:48 +0000
Subject:  Utilisateur : Fcolin       Date :  2/06/05   Heure : 18:42 Archivé
 dans $/Bus/Ivy Commentaire: Suppression de la STL et ajout d'un namespace
 pour les datatypes internes Ivy (vss 15)

---
 Bus/Ivy/BufferedSocket.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Bus')

diff --git a/Bus/Ivy/BufferedSocket.cxx b/Bus/Ivy/BufferedSocket.cxx
index 5f6c994..cae2404 100644
--- a/Bus/Ivy/BufferedSocket.cxx
+++ b/Bus/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 )
-- 
cgit v1.1