From 44309bb9fb2a7ee412045117b9879b08a1218fe5 Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:00:11 +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 22)

---
 Bus/Ivy/IvyApplication.cxx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Bus/Ivy/IvyApplication.cxx b/Bus/Ivy/IvyApplication.cxx
index 3eaecdb..fb399a6 100644
--- a/Bus/Ivy/IvyApplication.cxx
+++ b/Bus/Ivy/IvyApplication.cxx
@@ -81,7 +81,7 @@ void IvyApplication::Create(const char* host, UINT & port)
 
 UINT IvyApplication::Create()
 {
-	string host;
+	ivy::string host;
 	UINT port;
 	CBufferedSocket::Create();
 	// Max Listen Connexion 
@@ -164,7 +164,7 @@ void IvyApplication::OnReceive(char * line)
 			exp = pcre_compile( arg, PCRE_CASELESS, &errmsg, &erroffset, NULL );
 			if ( !exp )
 			{
-				string err( "Error can't compile regexp '" );
+				ivy::string err( "Error can't compile regexp '" );
 				err += arg;
 				err += "' error ";
 				err += errmsg;
@@ -176,7 +176,7 @@ void IvyApplication::OnReceive(char * line)
 			exp = new Regexp( arg );
 			if ( !exp->CompiledOK() )
 				{
-				string err( "Error can't compile regexp '" );
+				ivy::string err( "Error can't compile regexp '" );
 				err += arg;
 				err += "' error ";
 				err += exp->GetErrorString();
@@ -292,7 +292,7 @@ void IvyApplication::SendMsg(MsgType msg, int id, const char * arg)
 
 void IvyApplication::OnAccept(int nErrorCode) 
 {
-	string remotehost;
+	ivy::string remotehost;
 	UINT remoteport;
 	
 	// construct a new, empty socket
@@ -309,7 +309,7 @@ void IvyApplication::OnAccept(int nErrorCode)
 
 void IvyApplication::OnClose(int nErrorCode) 
 {
-	string remotehost;
+	ivy::string remotehost;
 	UINT remoteport;
 	GetPeerName( remotehost, remoteport );
 	TRACE("Deconnexion de %s:%u\n", remotehost.c_str(), remoteport );
@@ -344,7 +344,7 @@ int IvyApplication::SendMsg(const char *message)
 		int match_count = pcre_exec( exp, NULL, message, strlen( message ), 0, 0, ovector, max_subexp );
 		if ( match_count > 0 )
 		{
-			string buffer;
+			ivy::string buffer;
 			const char *substring;
 			for ( int j = 1; j < match_count; j++ )
 				{
@@ -359,7 +359,7 @@ int IvyApplication::SendMsg(const char *message)
 #else
 		if ( exp && exp->Match( message ) )
 			{
-			string buffer;
+			ivy::string buffer;
 			for ( int j = 1; j < exp->SubStrings()+1; j++ )
 				{
 				buffer += (*exp)[j];
@@ -381,9 +381,9 @@ return appname.c_str();
 
 BOOL IvyApplication::SameApplication(IvyApplication * app)
 {
- string host1;
+ ivy::string host1;
  UINT port1;
- string host2;
+ ivy::string host2;
  UINT port2;
  if ( (remoteService != 0) && (remoteService == app->remoteService) )
 	{
-- 
cgit v1.1