From c16ef3cc46a99fdf6cbc56f170ae64237ad4ab59 Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Fri, 24 Mar 2000 00:39:44 +0000 Subject: [PATCH] Use NS_MIN and NS_MAX instead of std::min and std::max. r=scc git-svn-id: svn://10.0.0.236/trunk@63955 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/public/nsAReadableString.h | 22 +++++++++++-------- mozilla/string/public/nsAWritableString.h | 18 +++++++-------- mozilla/xpcom/ds/nsAReadableString.h | 22 +++++++++++-------- mozilla/xpcom/ds/nsAWritableString.h | 18 +++++++-------- .../xpcom/string/public/nsAReadableString.h | 22 +++++++++++-------- .../xpcom/string/public/nsAWritableString.h | 18 +++++++-------- 6 files changed, 66 insertions(+), 54 deletions(-) diff --git a/mozilla/string/public/nsAReadableString.h b/mozilla/string/public/nsAReadableString.h index b803765e649..3d6c1766584 100644 --- a/mozilla/string/public/nsAReadableString.h +++ b/mozilla/string/public/nsAReadableString.h @@ -42,6 +42,10 @@ // for |min|, |copy| +#ifdef HAVE_CPP_USING +using namespace std; +#endif + /* This file defines the abstract interfaces |nsAReadableString| and |nsAReadableCString| (the 'A' is for 'abstract', as opposed to the 'I' in @@ -81,7 +85,7 @@ class basic_nsAReadableString ... */ { - protected: + public: struct ReadableFragment { @@ -227,7 +231,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -244,7 +248,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -286,7 +290,7 @@ class basic_nsAReadableString EndReading( PRUint32 aOffset = 0 ) const { ReadableFragment fragment; - const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return ReadingIterator(fragment, startPos, *this); } @@ -576,7 +580,7 @@ PRUint32 basic_nsAReadableString::Right( basic_nsAWritableString& aResult, PRUint32 aLengthToCopy ) const { PRUint32 myLength = Length(); - aLengthToCopy = min(myLength, aLengthToCopy); + aLengthToCopy = NS_MIN(myLength, aLengthToCopy); aResult = Substring(*this, myLength-aLengthToCopy, aLengthToCopy); return aResult.Length(); } @@ -883,8 +887,8 @@ class nsPromiseSubstring public: nsPromiseSubstring( const basic_nsAReadableString& aString, PRUint32 aStartPos, PRUint32 aLength ) : mString(aString), - mStartPos( min(aStartPos, aString.Length()) ), - mLength( min(aLength, aString.Length()-mStartPos) ) + mStartPos( NS_MIN(aStartPos, aString.Length()) ), + mLength( NS_MIN(aLength, aString.Length()-mStartPos) ) { // nothing else to do here } @@ -954,14 +958,14 @@ Compare( const basic_nsAReadableString& lhs, const basic_nsAReadableStrin PRUint32 lLength = lhs.Length(); PRUint32 rLength = rhs.Length(); - PRUint32 lengthToCompare = min(lLength, rLength); + PRUint32 lengthToCompare = NS_MIN(lLength, rLength); basic_nsAReadableString::ReadingIterator leftIter( lhs.BeginReading() ); basic_nsAReadableString::ReadingIterator rightIter( rhs.BeginReading() ); for (;;) { - PRUint32 lengthAvailable = PRUint32( min(leftIter.size_forward(), rightIter.size_forward()) ); + PRUint32 lengthAvailable = PRUint32( NS_MIN(leftIter.size_forward(), rightIter.size_forward()) ); // assert( lengthAvailable >= 0 ); if ( lengthAvailable > lengthToCompare ) diff --git a/mozilla/string/public/nsAWritableString.h b/mozilla/string/public/nsAWritableString.h index 6a9106e4b0d..8a40f6dd2f1 100644 --- a/mozilla/string/public/nsAWritableString.h +++ b/mozilla/string/public/nsAWritableString.h @@ -185,7 +185,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -202,7 +202,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -241,7 +241,7 @@ class basic_nsAWritableString EndWriting( PRUint32 aOffset = 0 ) { WritableFragment fragment; - CharT* startPos = GetWritableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return WritingIterator(fragment, startPos, *this); } @@ -330,9 +330,9 @@ copy_chunky( typename basic_nsAReadableString::ReadingIterator first, { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_forward(), result.size_forward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_forward(), result.size_forward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(last.operator->() - first.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(last.operator->() - first.operator->())); // assert(lengthToCopy > 0); @@ -353,9 +353,9 @@ copy_backward_chunky( typename basic_nsAReadableString::ReadingIterator { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_backward(), result.size_backward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_backward(), result.size_backward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(first.operator->() - last.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(first.operator->() - last.operator->())); nsCharTraits::move(result.operator->(), first.operator->(), lengthToCopy); @@ -421,8 +421,8 @@ basic_nsAWritableString::Replace( PRUint32 cutStart, PRUint32 cutLength, { PRUint32 oldLength = Length(); - cutStart = min(cutStart, oldLength); - cutLength = min(cutLength, oldLength-cutStart); + cutStart = NS_MIN(cutStart, oldLength); + cutLength = NS_MIN(cutLength, oldLength-cutStart); PRUint32 cutEnd = cutStart + cutLength; PRUint32 replacementLength = aReplacement.Length(); diff --git a/mozilla/xpcom/ds/nsAReadableString.h b/mozilla/xpcom/ds/nsAReadableString.h index b803765e649..3d6c1766584 100644 --- a/mozilla/xpcom/ds/nsAReadableString.h +++ b/mozilla/xpcom/ds/nsAReadableString.h @@ -42,6 +42,10 @@ // for |min|, |copy| +#ifdef HAVE_CPP_USING +using namespace std; +#endif + /* This file defines the abstract interfaces |nsAReadableString| and |nsAReadableCString| (the 'A' is for 'abstract', as opposed to the 'I' in @@ -81,7 +85,7 @@ class basic_nsAReadableString ... */ { - protected: + public: struct ReadableFragment { @@ -227,7 +231,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -244,7 +248,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -286,7 +290,7 @@ class basic_nsAReadableString EndReading( PRUint32 aOffset = 0 ) const { ReadableFragment fragment; - const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return ReadingIterator(fragment, startPos, *this); } @@ -576,7 +580,7 @@ PRUint32 basic_nsAReadableString::Right( basic_nsAWritableString& aResult, PRUint32 aLengthToCopy ) const { PRUint32 myLength = Length(); - aLengthToCopy = min(myLength, aLengthToCopy); + aLengthToCopy = NS_MIN(myLength, aLengthToCopy); aResult = Substring(*this, myLength-aLengthToCopy, aLengthToCopy); return aResult.Length(); } @@ -883,8 +887,8 @@ class nsPromiseSubstring public: nsPromiseSubstring( const basic_nsAReadableString& aString, PRUint32 aStartPos, PRUint32 aLength ) : mString(aString), - mStartPos( min(aStartPos, aString.Length()) ), - mLength( min(aLength, aString.Length()-mStartPos) ) + mStartPos( NS_MIN(aStartPos, aString.Length()) ), + mLength( NS_MIN(aLength, aString.Length()-mStartPos) ) { // nothing else to do here } @@ -954,14 +958,14 @@ Compare( const basic_nsAReadableString& lhs, const basic_nsAReadableStrin PRUint32 lLength = lhs.Length(); PRUint32 rLength = rhs.Length(); - PRUint32 lengthToCompare = min(lLength, rLength); + PRUint32 lengthToCompare = NS_MIN(lLength, rLength); basic_nsAReadableString::ReadingIterator leftIter( lhs.BeginReading() ); basic_nsAReadableString::ReadingIterator rightIter( rhs.BeginReading() ); for (;;) { - PRUint32 lengthAvailable = PRUint32( min(leftIter.size_forward(), rightIter.size_forward()) ); + PRUint32 lengthAvailable = PRUint32( NS_MIN(leftIter.size_forward(), rightIter.size_forward()) ); // assert( lengthAvailable >= 0 ); if ( lengthAvailable > lengthToCompare ) diff --git a/mozilla/xpcom/ds/nsAWritableString.h b/mozilla/xpcom/ds/nsAWritableString.h index 6a9106e4b0d..8a40f6dd2f1 100644 --- a/mozilla/xpcom/ds/nsAWritableString.h +++ b/mozilla/xpcom/ds/nsAWritableString.h @@ -185,7 +185,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -202,7 +202,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -241,7 +241,7 @@ class basic_nsAWritableString EndWriting( PRUint32 aOffset = 0 ) { WritableFragment fragment; - CharT* startPos = GetWritableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return WritingIterator(fragment, startPos, *this); } @@ -330,9 +330,9 @@ copy_chunky( typename basic_nsAReadableString::ReadingIterator first, { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_forward(), result.size_forward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_forward(), result.size_forward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(last.operator->() - first.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(last.operator->() - first.operator->())); // assert(lengthToCopy > 0); @@ -353,9 +353,9 @@ copy_backward_chunky( typename basic_nsAReadableString::ReadingIterator { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_backward(), result.size_backward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_backward(), result.size_backward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(first.operator->() - last.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(first.operator->() - last.operator->())); nsCharTraits::move(result.operator->(), first.operator->(), lengthToCopy); @@ -421,8 +421,8 @@ basic_nsAWritableString::Replace( PRUint32 cutStart, PRUint32 cutLength, { PRUint32 oldLength = Length(); - cutStart = min(cutStart, oldLength); - cutLength = min(cutLength, oldLength-cutStart); + cutStart = NS_MIN(cutStart, oldLength); + cutLength = NS_MIN(cutLength, oldLength-cutStart); PRUint32 cutEnd = cutStart + cutLength; PRUint32 replacementLength = aReplacement.Length(); diff --git a/mozilla/xpcom/string/public/nsAReadableString.h b/mozilla/xpcom/string/public/nsAReadableString.h index b803765e649..3d6c1766584 100644 --- a/mozilla/xpcom/string/public/nsAReadableString.h +++ b/mozilla/xpcom/string/public/nsAReadableString.h @@ -42,6 +42,10 @@ // for |min|, |copy| +#ifdef HAVE_CPP_USING +using namespace std; +#endif + /* This file defines the abstract interfaces |nsAReadableString| and |nsAReadableCString| (the 'A' is for 'abstract', as opposed to the 'I' in @@ -81,7 +85,7 @@ class basic_nsAReadableString ... */ { - protected: + public: struct ReadableFragment { @@ -227,7 +231,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -244,7 +248,7 @@ class basic_nsAReadableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -286,7 +290,7 @@ class basic_nsAReadableString EndReading( PRUint32 aOffset = 0 ) const { ReadableFragment fragment; - const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + const CharT* startPos = GetReadableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return ReadingIterator(fragment, startPos, *this); } @@ -576,7 +580,7 @@ PRUint32 basic_nsAReadableString::Right( basic_nsAWritableString& aResult, PRUint32 aLengthToCopy ) const { PRUint32 myLength = Length(); - aLengthToCopy = min(myLength, aLengthToCopy); + aLengthToCopy = NS_MIN(myLength, aLengthToCopy); aResult = Substring(*this, myLength-aLengthToCopy, aLengthToCopy); return aResult.Length(); } @@ -883,8 +887,8 @@ class nsPromiseSubstring public: nsPromiseSubstring( const basic_nsAReadableString& aString, PRUint32 aStartPos, PRUint32 aLength ) : mString(aString), - mStartPos( min(aStartPos, aString.Length()) ), - mLength( min(aLength, aString.Length()-mStartPos) ) + mStartPos( NS_MIN(aStartPos, aString.Length()) ), + mLength( NS_MIN(aLength, aString.Length()-mStartPos) ) { // nothing else to do here } @@ -954,14 +958,14 @@ Compare( const basic_nsAReadableString& lhs, const basic_nsAReadableStrin PRUint32 lLength = lhs.Length(); PRUint32 rLength = rhs.Length(); - PRUint32 lengthToCompare = min(lLength, rLength); + PRUint32 lengthToCompare = NS_MIN(lLength, rLength); basic_nsAReadableString::ReadingIterator leftIter( lhs.BeginReading() ); basic_nsAReadableString::ReadingIterator rightIter( rhs.BeginReading() ); for (;;) { - PRUint32 lengthAvailable = PRUint32( min(leftIter.size_forward(), rightIter.size_forward()) ); + PRUint32 lengthAvailable = PRUint32( NS_MIN(leftIter.size_forward(), rightIter.size_forward()) ); // assert( lengthAvailable >= 0 ); if ( lengthAvailable > lengthToCompare ) diff --git a/mozilla/xpcom/string/public/nsAWritableString.h b/mozilla/xpcom/string/public/nsAWritableString.h index 6a9106e4b0d..8a40f6dd2f1 100644 --- a/mozilla/xpcom/string/public/nsAWritableString.h +++ b/mozilla/xpcom/string/public/nsAWritableString.h @@ -185,7 +185,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_forward()); + difference_type one_hop = NS_MIN(n, size_forward()); mPosition += one_hop; normalize_forward(); n -= one_hop; @@ -202,7 +202,7 @@ class basic_nsAWritableString while ( n ) { - difference_type one_hop = min(n, size_backward()); + difference_type one_hop = NS_MIN(n, size_backward()); mPosition -= one_hop; normalize_backward(); n -= one_hop; @@ -241,7 +241,7 @@ class basic_nsAWritableString EndWriting( PRUint32 aOffset = 0 ) { WritableFragment fragment; - CharT* startPos = GetWritableFragment(fragment, kFragmentAt, max(0U, Length()-aOffset)); + CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, Length()-aOffset)); return WritingIterator(fragment, startPos, *this); } @@ -330,9 +330,9 @@ copy_chunky( typename basic_nsAReadableString::ReadingIterator first, { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_forward(), result.size_forward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_forward(), result.size_forward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(last.operator->() - first.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(last.operator->() - first.operator->())); // assert(lengthToCopy > 0); @@ -353,9 +353,9 @@ copy_backward_chunky( typename basic_nsAReadableString::ReadingIterator { while ( first != last ) { - PRUint32 lengthToCopy = PRUint32( min(first.size_backward(), result.size_backward()) ); + PRUint32 lengthToCopy = PRUint32( NS_MIN(first.size_backward(), result.size_backward()) ); if ( first.fragment().mStart == last.fragment().mStart ) - lengthToCopy = min(lengthToCopy, PRUint32(first.operator->() - last.operator->())); + lengthToCopy = NS_MIN(lengthToCopy, PRUint32(first.operator->() - last.operator->())); nsCharTraits::move(result.operator->(), first.operator->(), lengthToCopy); @@ -421,8 +421,8 @@ basic_nsAWritableString::Replace( PRUint32 cutStart, PRUint32 cutLength, { PRUint32 oldLength = Length(); - cutStart = min(cutStart, oldLength); - cutLength = min(cutLength, oldLength-cutStart); + cutStart = NS_MIN(cutStart, oldLength); + cutLength = NS_MIN(cutLength, oldLength-cutStart); PRUint32 cutEnd = cutStart + cutLength; PRUint32 replacementLength = aReplacement.Length();