diff options
| -rw-r--r-- | Ivy/IvyApplication.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Ivy/IvyApplication.cxx b/Ivy/IvyApplication.cxx index d949845..79110e1 100644 --- a/Ivy/IvyApplication.cxx +++ b/Ivy/IvyApplication.cxx @@ -49,7 +49,7 @@ void IvyApplication::Create(const char* host, UINT & port) UINT IvyApplication::Create()
{
- string host;
+ String host;
UINT port;
CBufferedSocket::Create();
// Max Listen Connexion
@@ -122,9 +122,9 @@ void IvyApplication::OnReceive(char * line) exp = new Regexp( arg );
if ( !exp->CompiledOK() )
{
- string regerr = exp->GetErrorString();
- string err;
- err = "Error can't compile regexp '"+string(arg)+"' error "+regerr;
+ String regerr = exp->GetErrorString();
+ String err;
+ err = "Error can't compile regexp '"+String(arg)+"' error "+regerr;
SendMsg( Error, Error, err.c_str() );
TRACE("IvyApplication %s\n",err.c_str());
return;
@@ -228,7 +228,7 @@ void IvyApplication::SendMsg(MsgType msg, int id, const char * arg) void IvyApplication::OnAccept(int nErrorCode)
{
- string remotehost;
+ String remotehost;
UINT remoteport;
// construct a new, empty socket
@@ -245,7 +245,7 @@ void IvyApplication::OnAccept(int nErrorCode) void IvyApplication::OnClose(int nErrorCode)
{
- string remotehost;
+ String remotehost;
UINT remoteport;
GetPeerName( remotehost, remoteport );
TRACE("Deconnexion de %s:%u\n", remotehost.c_str(), remoteport );
@@ -262,7 +262,7 @@ int IvyApplication::SendMsg(const char *message) {
int count = 0;
Regexp *exp;
- map<int,Regexp*>::iterator iter;
+ std::map<int,Regexp*>::iterator iter;
/* send to already connected */
if ( !regexp_in.empty() )
for ( iter = regexp_in.begin(); iter != regexp_in.end(); iter++ )
@@ -271,7 +271,7 @@ int IvyApplication::SendMsg(const char *message) if ( exp && exp->Match( message ) )
{
- string buffer;
+ String buffer;
for ( int i = 1; i < exp->SubStrings()+1; i++ )
{
buffer += (*exp)[i];
@@ -292,9 +292,9 @@ return appname.c_str(); BOOL IvyApplication::SameApplication(IvyApplication * app)
{
- string host1;
+ String host1;
UINT port1;
- string host2;
+ String host2;
UINT port2;
if ( (remoteService != 0) && (remoteService == app->remoteService) )
{
|