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 11)

1 files changed, 4 insertions, 4 deletions

diff --git a/Bus/Ivy/IvyWatcher.cxx b/Bus/Ivy/IvyWatcher.cxx
index af19fe5..424c8ac 100644
--- a/Bus/Ivy/IvyWatcher.cxx
+++ b/Bus/Ivy/IvyWatcher.cxx
@@ -31,7 +31,7 @@ void IvyWatcher::OnReceive(int nErrorCode)
 	int err;

 	int version;

 	char buffer[256];

-	string remotehost;

+	ivy::string remotehost;

 	UINT remoteport;

 	UINT serviceport;

 

@@ -53,7 +53,7 @@ void IvyWatcher::OnReceive(int nErrorCode)
 	if ( version != VERSION )

 		{

 		/* ignore the message */

-		TRACE(" Bad Ivy verion number expected %d receive %d from %s:%d\n", VERSION,version, remotehost, remoteport);

+		TRACE(" Bad Ivy verion number expected %d receive %d from %s:%d\n", VERSION,version, remotehost.c_str(), remoteport);

 		return;

 		}

 	/* check if we receive our own message 	should test also the host */

@@ -75,7 +75,7 @@ void IvyWatcher::OnReceive(int nErrorCode)
 void IvyWatcher::start(const char *domainlist)

 {

 	BOOL reuse = TRUE;

-	string domain;

+	ivy::string domain;

 	UINT port=0;

 	// determine domain to use

 	domain = bus->GetDomain( domainlist );

@@ -95,7 +95,7 @@ void IvyWatcher::start(const char *domainlist)
 	Bind(port);

 	StartListener();

 	

-	string addr;

+	ivy::string addr;

 	char hello[1024];

 	int len = _snprintf( hello, sizeof(hello), "%d %u\n", VERSION, bus->GetApplicationPort() );