Utilisateur : Fcolin Date : 31/01/01 Heure : 11:18 Archivé dans $/Ivy (vss 5)

1 files changed, 11 insertions, 9 deletions

diff --git a/Bus/Ivy/Ivy.cxx b/Bus/Ivy/Ivy.cxx
index 7ab5ac9..54b7069 100644
--- a/Bus/Ivy/Ivy.cxx
+++ b/Bus/Ivy/Ivy.cxx
@@ -83,9 +83,11 @@ const char * Ivy::GetDomain(const char *domainlist)
 		}

 	if ( domain.empty() )

 		{

+#ifdef _WIN_CE

 		const char *env = getenv ( "IVYBUS" );

 		if ( env )

 			domain = env;

+#endif

 		if ( domain.empty() )

 			domain = DEFAULT_DOMAIN;

 		}

@@ -94,7 +96,7 @@ const char * Ivy::GetDomain(const char *domainlist)
 	if ( sep_index == -1 )

 		{

 		domain = DEFAULT_DOMAIN;

-		TRACE(" Missing ':' in domain list using default domain %s\n", domain.c_str() );

+		TRACE(" Missing ':' in domain list using default domain %s\n", domain );

 		}

 	if ( sep_index == 0 )

 		{

@@ -155,7 +157,7 @@ void Ivy::BindDirectMsg(IvyDirectMessageCallback *callback)
 direct_callback = callback;

 }

 

-UINT Ivy::GetApplicationPort()

+unsigned short Ivy::GetApplicationPort()

 {

 	return applicationPort;

 }

@@ -183,7 +185,7 @@ void Ivy::RemoveApplication(IvyApplication * app)
 	/// OLD NOT called because of deallocation PB 

 	// the real remove is done at arrival of a new Application 

 	// or at the bus Stop

-	assert( TRUE );

+	ASSERT( TRUE );

 	if ( app )

 	{

 	

@@ -199,7 +201,7 @@ void Ivy::SendSubscriptions(IvyApplication *app)
 	app->SendMsg( IvyApplication::StartRegexp, GetApplicationPort(), appname.c_str());

 	for ( int id = 0 ; id < regexp_out.size(); id++ )

 	{

-		const String& regexp = regexp_out[id];

+		const string& regexp = regexp_out[id];

 		if ( !regexp.empty() )

 			app->SendMsg( IvyApplication::AddRegexp, id, regexp.c_str());

 	}

@@ -240,7 +242,7 @@ void Ivy::CallDirectMessageCallback(IvyApplication *app, int id,  const char *ar
 		}

 }

 

-BOOL Ivy::CallDieCallback(IvyApplication *app, int id,  const char *arg)

+bool Ivy::CallDieCallback(IvyApplication *app, int id,  const char *arg)

 {

 	if ( die_callback )

 		{

@@ -268,14 +270,14 @@ void Ivy::SendDirectMsg(IvyApplication * app, int id, const char *message)
 	app->SendMsg( IvyApplication::DirectMsg, id, message );

 }

 

-BOOL Ivy::CheckRegexp(const char * exp)

+bool Ivy::CheckRegexp(const char * exp)

 {

 	/* accepte tout par default */

 	int i;

-	int regexp_ok = 1;

+	bool regexp_ok = true;

 	if ( *exp =='^' && messages_classes_count !=0 )

 	{

-		regexp_ok = 0;

+		regexp_ok = false;

 		for ( i = 0 ; i < messages_classes_count; i++ )

 		{

 			if (strncmp( messages_classes[i], exp+1, strlen( messages_classes[i] )) == 0)

@@ -291,7 +293,7 @@ void Ivy::Classes(int argc, const char **argv )
 	messages_classes = argv;

 }

 

-BOOL Ivy::CheckConnected(IvyApplication * app)

+bool Ivy::CheckConnected(IvyApplication * app)

 {

 	if (app->remoteService == 0)	/* old application dont check */

 		return false;