Start trying to compile on Unix with new changes. r=scc

This commit is contained in:
waterson%netscape.com 2000-04-04 05:45:57 +00:00
Родитель c7f2aa9d6f
Коммит fbfadbfae0
3 изменённых файлов: 105 добавлений и 99 удалений

Просмотреть файл

@ -386,22 +386,6 @@ basic_nsAReadableString<CharT>::Equals( const basic_nsAReadableString<CharT>& rh
return Compare(rhs) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
PRBool
@ -573,21 +557,6 @@ basic_nsAReadableString<CharT>::Compare( const basic_nsAReadableString<CharT>& r
return ::Compare(*this, rhs);
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -678,6 +647,39 @@ basic_nsLiteralString<CharT>::Length() const
}
// XXX Note that these are located here because some compilers are
// sensitive to the ordering of declarations with regard to templates.
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -984,7 +986,7 @@ copy_string( InputIterator first, InputIterator last, OutputIterator result )
NS_ASSERTION(lengthToCopy, "|copy_string| will never terminate");
nsCharTraits<InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
@ -1026,7 +1028,7 @@ copy_string_backward( InputIterator first, InputIterator last, OutputIterator re
NS_ASSERTION(lengthToCopy, "|copy_string_backward| will never terminate");
nsCharTraits<InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
last -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);

Просмотреть файл

@ -386,22 +386,6 @@ basic_nsAReadableString<CharT>::Equals( const basic_nsAReadableString<CharT>& rh
return Compare(rhs) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
PRBool
@ -573,21 +557,6 @@ basic_nsAReadableString<CharT>::Compare( const basic_nsAReadableString<CharT>& r
return ::Compare(*this, rhs);
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -678,6 +647,39 @@ basic_nsLiteralString<CharT>::Length() const
}
// XXX Note that these are located here because some compilers are
// sensitive to the ordering of declarations with regard to templates.
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -984,7 +986,7 @@ copy_string( InputIterator first, InputIterator last, OutputIterator result )
NS_ASSERTION(lengthToCopy, "|copy_string| will never terminate");
nsCharTraits<InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
@ -1026,7 +1028,7 @@ copy_string_backward( InputIterator first, InputIterator last, OutputIterator re
NS_ASSERTION(lengthToCopy, "|copy_string_backward| will never terminate");
nsCharTraits<InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
last -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);

Просмотреть файл

@ -386,22 +386,6 @@ basic_nsAReadableString<CharT>::Equals( const basic_nsAReadableString<CharT>& rh
return Compare(rhs) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
PRBool
@ -573,21 +557,6 @@ basic_nsAReadableString<CharT>::Compare( const basic_nsAReadableString<CharT>& r
return ::Compare(*this, rhs);
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -678,6 +647,39 @@ basic_nsLiteralString<CharT>::Length() const
}
// XXX Note that these are located here because some compilers are
// sensitive to the ordering of declarations with regard to templates.
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs)) == 0;
}
template <class CharT>
inline
PRBool
basic_nsAReadableString<CharT>::Equals( const CharT* rhs, PRUint32 rhs_length ) const
{
return Compare(basic_nsLiteralString<CharT>(rhs, rhs_length)) == 0;
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs));
}
template <class CharT>
inline
int
basic_nsAReadableString<CharT>::Compare( const CharT* rhs, PRUint32 rhs_length ) const
{
return ::Compare(*this, basic_nsLiteralString<CharT>(rhs, rhs_length));
}
@ -984,7 +986,7 @@ copy_string( InputIterator first, InputIterator last, OutputIterator result )
NS_ASSERTION(lengthToCopy, "|copy_string| will never terminate");
nsCharTraits<InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
@ -1026,7 +1028,7 @@ copy_string_backward( InputIterator first, InputIterator last, OutputIterator re
NS_ASSERTION(lengthToCopy, "|copy_string_backward| will never terminate");
nsCharTraits<InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
nsCharTraits<typename InputIterator::value_type>::move(result.operator->()-lengthToCopy, last.operator->()-lengthToCopy, lengthToCopy);
last -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);