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

Fix gcc 2.7.x bustage by defining |operator+()| for combinations involving |nsPromiseSubstring|, within |#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS|. (Based on scc's proposal earlier.) r=waterson

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@82087 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu
2000-10-31 04:33:32 +00:00
parent e7a1de03a2
commit 569c30eb6d
3 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/xpcom/string/public/nsAReadableString.h
View File

@@ -1271,6 +1271,22 @@ nsPromiseSubstring<CharT>::GetReadableFragment( nsReadableFragment<CharT>& aFrag
#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
#define NS_DEF_TEMPLATE_OPERATOR_PLUS
#define NS_DEF_TEMPLATE_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T) \
template <class CharT> \
inline \
nsPromiseConcatenation<CharT> \
operator+( const _String1T<CharT>& lhs, const _String2T<CharT>& rhs ) \
{ \
return nsPromiseConcatenation<CharT>(lhs, rhs); \
}
NS_DEF_TEMPLATE_DERIVED_STRING_STRING_OPERATOR_PLUS(nsPromiseSubstring, nsPromiseSubstring)
NS_DEF_TEMPLATE_DERIVED_STRING_STRING_OPERATOR_PLUS(nsPromiseConcatenation, nsPromiseSubstring)
#endif // NEED_CPP_DERIVED_TEMPLATE_OPERATORS
//
@@ -1410,6 +1426,8 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
#define NS_DEF_DERIVED_STRING_OPERATOR_PLUS(_StringT, _CharT) \
NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_StringT, _StringT, _CharT) \
NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(nsPromiseSubstring<_CharT>, _StringT, _CharT) \
NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_StringT, nsPromiseSubstring<_CharT>, _CharT) \
NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(nsPromiseConcatenation<_CharT>, _StringT, _CharT)
#define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \