Getting rid of warnings. These files are not yet part of the build.

This commit is contained in:
scc%netscape.com 2000-03-22 22:51:18 +00:00
parent e96efc2dbd
commit 2f1956e29f
6 changed files with 33 additions and 33 deletions

View File

@ -952,7 +952,7 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
for (;;)
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthAvailable = std::min(leftIter.size_forward(), rightIter.size_forward());
PRUint32 lengthAvailable = PRUint32( std::min(leftIter.size_forward(), rightIter.size_forward()) );
// assert( lengthAvailable >= 0 );
if ( lengthAvailable > lengthToCompare )
@ -964,8 +964,8 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
if ( !(lengthToCompare -= lengthAvailable) )
break;
leftIter += lengthAvailable;
rightIter += lengthAvailable;
leftIter += PRInt32(lengthAvailable);
rightIter += PRInt32(lengthAvailable);
}
if ( lLength < rLength )

View File

@ -346,16 +346,16 @@ copy_chunky( typename basic_nsAReadableString<CharT>::ConstIterator first,
{
while ( first != last )
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_forward(), result.size_forward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_forward(), result.size_forward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, last.operator->() - first.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(last.operator->() - first.operator->()));
// assert(lengthToCopy > 0);
std::char_traits<CharT>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += lengthToCopy;
result += lengthToCopy;
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
}
return result;
@ -369,14 +369,14 @@ copy_backward_chunky( typename basic_nsAReadableString<CharT>::ConstIterator fir
{
while ( first != last )
{
typename basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_backward(), result.size_backward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_backward(), result.size_backward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, first.operator->() - last.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(first.operator->() - last.operator->()));
std::char_traits<CharT>::move(result.operator->(), first.operator->(), lengthToCopy);
first -= lengthToCopy;
result -= lengthToCopy;
first -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);
}
return result;

View File

@ -952,7 +952,7 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
for (;;)
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthAvailable = std::min(leftIter.size_forward(), rightIter.size_forward());
PRUint32 lengthAvailable = PRUint32( std::min(leftIter.size_forward(), rightIter.size_forward()) );
// assert( lengthAvailable >= 0 );
if ( lengthAvailable > lengthToCompare )
@ -964,8 +964,8 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
if ( !(lengthToCompare -= lengthAvailable) )
break;
leftIter += lengthAvailable;
rightIter += lengthAvailable;
leftIter += PRInt32(lengthAvailable);
rightIter += PRInt32(lengthAvailable);
}
if ( lLength < rLength )

View File

@ -346,16 +346,16 @@ copy_chunky( typename basic_nsAReadableString<CharT>::ConstIterator first,
{
while ( first != last )
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_forward(), result.size_forward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_forward(), result.size_forward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, last.operator->() - first.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(last.operator->() - first.operator->()));
// assert(lengthToCopy > 0);
std::char_traits<CharT>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += lengthToCopy;
result += lengthToCopy;
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
}
return result;
@ -369,14 +369,14 @@ copy_backward_chunky( typename basic_nsAReadableString<CharT>::ConstIterator fir
{
while ( first != last )
{
typename basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_backward(), result.size_backward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_backward(), result.size_backward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, first.operator->() - last.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(first.operator->() - last.operator->()));
std::char_traits<CharT>::move(result.operator->(), first.operator->(), lengthToCopy);
first -= lengthToCopy;
result -= lengthToCopy;
first -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);
}
return result;

View File

@ -952,7 +952,7 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
for (;;)
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthAvailable = std::min(leftIter.size_forward(), rightIter.size_forward());
PRUint32 lengthAvailable = PRUint32( std::min(leftIter.size_forward(), rightIter.size_forward()) );
// assert( lengthAvailable >= 0 );
if ( lengthAvailable > lengthToCompare )
@ -964,8 +964,8 @@ Compare( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStrin
if ( !(lengthToCompare -= lengthAvailable) )
break;
leftIter += lengthAvailable;
rightIter += lengthAvailable;
leftIter += PRInt32(lengthAvailable);
rightIter += PRInt32(lengthAvailable);
}
if ( lLength < rLength )

View File

@ -346,16 +346,16 @@ copy_chunky( typename basic_nsAReadableString<CharT>::ConstIterator first,
{
while ( first != last )
{
basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_forward(), result.size_forward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_forward(), result.size_forward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, last.operator->() - first.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(last.operator->() - first.operator->()));
// assert(lengthToCopy > 0);
std::char_traits<CharT>::copy(result.operator->(), first.operator->(), lengthToCopy);
first += lengthToCopy;
result += lengthToCopy;
first += PRInt32(lengthToCopy);
result += PRInt32(lengthToCopy);
}
return result;
@ -369,14 +369,14 @@ copy_backward_chunky( typename basic_nsAReadableString<CharT>::ConstIterator fir
{
while ( first != last )
{
typename basic_nsAReadableString<CharT>::ConstIterator::difference_type lengthToCopy = std::min(first.size_backward(), result.size_backward());
PRUint32 lengthToCopy = PRUint32( std::min(first.size_backward(), result.size_backward()) );
if ( first.fragment().mStart == last.fragment().mStart )
lengthToCopy = std::min(lengthToCopy, first.operator->() - last.operator->());
lengthToCopy = std::min(lengthToCopy, PRUint32(first.operator->() - last.operator->()));
std::char_traits<CharT>::move(result.operator->(), first.operator->(), lengthToCopy);
first -= lengthToCopy;
result -= lengthToCopy;
first -= PRInt32(lengthToCopy);
result -= PRInt32(lengthToCopy);
}
return result;