diff options
Diffstat (limited to 'Bus/Ivy')
| -rw-r--r-- | Bus/Ivy/Regexp.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Bus/Ivy/Regexp.cxx b/Bus/Ivy/Regexp.cxx index 4ba60e3..5916ec8 100644 --- a/Bus/Ivy/Regexp.cxx +++ b/Bus/Ivy/Regexp.cxx @@ -1556,10 +1556,10 @@ int Regexp::SubStrings() const return ret;
}
-int Regexp::SubStart( unsigned int i ) const
+size_t Regexp::SubStart( size_t i ) const
{
ClearErrorString();
- int ret = -1;
+ size_t ret = -1;
if ( rc )
ret = rc->startp[safeIndex(i)] - str;
else
@@ -1567,10 +1567,10 @@ int Regexp::SubStart( unsigned int i ) const return ret;
}
-int Regexp::SubLength( unsigned int i ) const
+size_t Regexp::SubLength( size_t i ) const
{
ClearErrorString();
- int ret = -1;
+ size_t ret = -1;
if ( rc )
{
i = safeIndex(i);
@@ -1598,19 +1598,19 @@ void Regexp::Dump() }
#endif
-int Regexp::safeIndex( unsigned int i ) const
+size_t Regexp::safeIndex( size_t i ) const
{
return i < Regexp::NSUBEXP ? i : Regexp::NSUBEXP;
}
-const ivy::string Regexp::operator[]( unsigned int i ) const
+const ivy::string Regexp::operator[]( size_t i ) const
{
ivy::string value;
ClearErrorString();
ASSERT( rc );
if ( rc )
{
- int len = SubLength(i);
+ size_t len = SubLength(i);
//char * szbuf = buffer.GetBufferSetLength( len );
//memcpy( szbuf, rc->startp[i], len * sizeof(char) );
//buffer.ReleaseBuffer();
@@ -1672,7 +1672,7 @@ ivy::string regexp::GetReplaceString( const char* sReplaceExp ) const }
// First compute the length of the string
- int replacelen = 0;
+ size_t replacelen = 0;
while ((c = *src++) != '\0')
{
if (c == '&')
|