Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing build bustage. r=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@77749 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
2000-08-31 06:00:21 +00:00
parent fc5da7534f
commit e4ac42fcaf
9 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/string/obsolete/nsString.h
View File

@@ -808,7 +808,7 @@ private:
void InsertWithConversion( char, PRUint32 );
};
#ifdef NEW_STRING_APIS
#if 0 // #ifdef NEW_STRING_APIS
inline
nsPromiseConcatenation<char>
operator+( const nsPromiseConcatenation<char>& lhs, const nsCString& rhs )
@@ -819,7 +819,7 @@ operator+( const nsPromiseConcatenation<char>& lhs, const nsCString& rhs )
#ifdef NEW_STRING_APIS
NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char);
// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char);
#endif
extern NS_COM int fputs(const nsCString& aString, FILE* out);

4
mozilla/string/obsolete/nsString2.h
View File

@@ -896,10 +896,10 @@ private:
#ifdef NEW_STRING_APIS
NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
// NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
#endif
#ifdef NEW_STRING_APIS
#if 0 // #ifdef NEW_STRING_APIS
inline
nsPromiseConcatenation<PRUnichar>
operator+( const nsPromiseConcatenation<PRUnichar>& lhs, const nsString& rhs )

40
mozilla/string/public/nsAReadableString.h
View File

@@ -950,7 +950,9 @@ class nsPromiseConcatenation
virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const;
// virtual PRBool PromisesExactly( const basic_nsAReadableString<CharT>& ) const;
nsPromiseConcatenation<CharT> operator+( const basic_nsAReadableString<CharT>& rhs ) const;
// nsPromiseConcatenation<CharT> operator+( const basic_nsAReadableString<CharT>& rhs ) const;
PRUint32 GetFragmentIdentifierMask() const { return mFragmentIdentifierMask; }
private:
void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED
@@ -1051,6 +1053,7 @@ nsPromiseConcatenation<CharT>::GetReadableFragment( nsReadableFragment<CharT>& a
return result;
}
#if 0
template <class CharT>
inline
nsPromiseConcatenation<CharT>
@@ -1058,7 +1061,7 @@ nsPromiseConcatenation<CharT>::operator+( const basic_nsAReadableString<CharT>&
{
return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1);
}
#endif
@@ -1271,6 +1274,14 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
automatic conversion to a literal string will not happen.
*/
template <class CharT>
inline
nsPromiseConcatenation<CharT>
operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
{
return nsPromiseConcatenation<CharT>(lhs, rhs, lhs.GetFragmentIdentifierMask());
}
template <class CharT>
inline
nsPromiseConcatenation<CharT>
@@ -1279,6 +1290,8 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
return nsPromiseConcatenation<CharT>(lhs, rhs);
}
#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
#define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \
inline \
@@ -1300,29 +1313,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
#define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT)
#endif
template <class CharT>
inline
nsPromiseConcatenation<CharT>
operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsLiteralString<CharT>& rhs )
{
return nsPromiseConcatenation<CharT>(lhs, rhs);
}
template <class CharT>
inline
nsPromiseConcatenation<CharT>
operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
{
return nsPromiseConcatenation<CharT>(lhs, rhs);
}
template <class CharT>
inline
nsPromiseConcatenation<CharT>
operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsLiteralString<CharT>& rhs )
{
return nsPromiseConcatenation<CharT>(lhs, rhs);
}
#define kDefaultFlatStringSize 64