From 2463a4b909e35d2312bdffbae124e3edc542cc8c Mon Sep 17 00:00:00 2001
From: fcolin
Date: Thu, 1 Feb 2007 13:04:20 +0000
Subject:  Utilisateur : Fcolin       Date : 23/01/01   Heure : 13:12 Archivé
 dans $/Ivy Commentaire: remove 'using name space std;' (vss 4)

---
 Ivy/Regexp.cxx | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Ivy/Regexp.cxx b/Ivy/Regexp.cxx
index 049a22c..01f3d45 100644
--- a/Ivy/Regexp.cxx
+++ b/Ivy/Regexp.cxx
@@ -219,7 +219,7 @@ enum {
 class CRegErrorHandler
 {
 	friend Regexp;
-	mutable string m_szError;
+	mutable String m_szError;
 	static const char * FindErr( int id );
 protected:
 	void ClearErrorString() const;
@@ -229,7 +229,7 @@ public:
 	CRegErrorHandler() { }
 	CRegErrorHandler( const CRegErrorHandler & reh ) : m_szError( reh.m_szError ) {}
 
-	const string & GetErrorString() const;
+	const String & GetErrorString() const;
 };
 
 void CRegErrorHandler::regerror( const char * s ) const
@@ -243,7 +243,7 @@ void CRegErrorHandler::regerror( int id ) const
 	regerror( FindErr( id ) );
 }
 
-const string & CRegErrorHandler::GetErrorString() const
+const String & CRegErrorHandler::GetErrorString() const
 {
 	return m_szError;
 }
@@ -324,7 +324,7 @@ public:
 	bool regexec( const char * string );
 	bool Status() const { return status; }
 
-	string GetReplaceString( const char* sReplaceExp ) const;
+	String GetReplaceString( const char* sReplaceExp ) const;
 
 	regexp * getCopy();
 
@@ -333,8 +333,8 @@ public:
 #endif
 	
 #ifdef _DEBUG
-	string m_originalPattern;
-	string m_modifiedPattern;
+	String m_originalPattern;
+	String m_modifiedPattern;
 #endif
 };
 
@@ -1535,7 +1535,7 @@ bool Regexp::Match( const char * s )
 	return ret;
 }
 
-string Regexp::GetReplaceString( const char * source ) const
+String Regexp::GetReplaceString( const char * source ) const
 {
 	ClearErrorString();
 	if ( rc )
@@ -1603,9 +1603,9 @@ int Regexp::safeIndex( unsigned int i ) const
 	return i < Regexp::NSUBEXP ? i : Regexp::NSUBEXP;
 }
 
-const string Regexp::operator[]( unsigned int i ) const
+const String Regexp::operator[]( unsigned int i ) const
 {
-	string value;
+	String value;
 	ClearErrorString();
 	assert( rc );
 	if ( rc )
@@ -1650,9 +1650,9 @@ void regexp::ignoreCase( const char * in, char * out )
 // GetReplaceString	- Converts a replace expression to a string
 //					- perform substitutions after a regexp match
 // Returns			- The resultant string
-string regexp::GetReplaceString( const char* sReplaceExp ) const
+String regexp::GetReplaceString( const char* sReplaceExp ) const
 {
-	string szEmpty( "" );
+	String szEmpty( "" );
 
 	char *src = (char *)sReplaceExp;
 	//char *buf;
@@ -1698,7 +1698,7 @@ string regexp::GetReplaceString( const char* sReplaceExp ) const
 		}
 	}
 
-	string szReplace;
+	String szReplace;
 
 	//buf = szReplace.GetBufferSetLength( replacelen );
 
@@ -1741,7 +1741,7 @@ string regexp::GetReplaceString( const char* sReplaceExp ) const
 	return szReplace;
 }
 
-string Regexp::GetErrorString() const
+String Regexp::GetErrorString() const
 {
 	// make sure that if status == 0 that we have an error string
 	//assert( ( ! CompiledOK() ) ? ( rc ? rc->GetErrorString() : m_szError).length() != 0 : 1 );
-- 
cgit v1.1