diff options
| -rw-r--r-- | Ivy/Regexp.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Ivy/Regexp.cxx b/Ivy/Regexp.cxx index bcbbf0c..4ba60e3 100644 --- a/Ivy/Regexp.cxx +++ b/Ivy/Regexp.cxx @@ -219,7 +219,7 @@ enum { class CRegErrorHandler
{
friend Regexp;
- mutable string m_szError;
+ mutable ivy::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 ivy::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 ivy::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;
+ ivy::string GetReplaceString( const char* sReplaceExp ) const;
regexp * getCopy();
@@ -333,8 +333,8 @@ public: #endif
#ifdef _DEBUG
- string m_originalPattern;
- string m_modifiedPattern;
+ ivy::string m_originalPattern;
+ ivy::string m_modifiedPattern;
#endif
};
@@ -1535,7 +1535,7 @@ bool Regexp::Match( const char * s ) return ret;
}
-string Regexp::GetReplaceString( const char * source ) const
+ivy::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 ivy::string Regexp::operator[]( unsigned int i ) const
{
- string value;
+ ivy::string value;
ClearErrorString();
ASSERT( rc );
if ( rc )
@@ -1614,7 +1614,7 @@ const string Regexp::operator[]( unsigned int i ) const //char * szbuf = buffer.GetBufferSetLength( len );
//memcpy( szbuf, rc->startp[i], len * sizeof(char) );
//buffer.ReleaseBuffer();
- value = string ( rc->startp[i], len );
+ value = ivy::string ( rc->startp[i], len );
}
else
{
@@ -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
+ivy::string regexp::GetReplaceString( const char* sReplaceExp ) const
{
- string szEmpty( "" );
+ ivy::string szEmpty( "" );
char *src = (char *)sReplaceExp;
//char *buf;
@@ -1698,7 +1698,7 @@ string regexp::GetReplaceString( const char* sReplaceExp ) const }
}
- string szReplace;
+ ivy::string szReplace;
//buf = szReplace.GetBufferSetLength( replacelen );
@@ -1741,7 +1741,7 @@ string regexp::GetReplaceString( const char* sReplaceExp ) const return szReplace;
}
-string Regexp::GetErrorString() const
+ivy::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 );
|