Back out my backout, now that mac seems to be fixed

git-svn-id: svn://10.0.0.236/trunk@106633 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2001-10-30 03:39:18 +00:00
parent f09c6040bb
commit 6ebb917688
9 changed files with 72 additions and 146 deletions

View File

@@ -34,10 +34,10 @@ nsDefaultStringComparator::operator()( const char_type* lhs, const char_type* rh
}
int
nsCaseInsensitiveStringComparator::operator()( const char_type* lhs, const char_type* rhs, PRUint32 aLength ) const
nsDefaultStringComparator::operator()( char_type lhs, char_type rhs) const
{
return nsCRT::strncasecmp(lhs, rhs, aLength);
}
return lhs - rhs;
}
NS_COM
int
@@ -537,12 +537,29 @@ nsDefaultCStringComparator::operator()( const char_type* lhs, const char_type* r
return nsCharTraits<char_type>::compare(lhs, rhs, aLength);
}
PRBool
nsDefaultCStringComparator::operator()( char_type lhs, char_type rhs ) const
{
return lhs - rhs;
}
int
nsCaseInsensitiveCStringComparator::operator()( const char_type* lhs, const char_type* rhs, PRUint32 aLength ) const
{
return nsCRT::strncasecmp(lhs, rhs, aLength);
}
PRBool
nsCaseInsensitiveCStringComparator::operator()( char lhs, char rhs ) const
{
if (lhs == rhs) return 0;
lhs = nsCRT::ToLower(lhs);
rhs = nsCRT::ToLower(rhs);
return lhs - rhs;
}
NS_COM
int
Compare( const nsACString& lhs, const nsACString& rhs, const nsCStringComparator& aComparator )