mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

back out my change until we can get it to build on the mac. This re-introduces the infinite loops when you run the browser though 

so be warned.
This commit is contained in:
mscott%netscape.com 2000-08-31 05:43:21 +00:00
Родитель 7348a6b798
Коммит 3dd88adffe
3 изменённых файлов: 6 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
string/public/nsAReadableString.h
Просмотреть файл

@ -950,9 +950,7 @@ class nsPromiseConcatenation
virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const; virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const;
// virtual PRBool PromisesExactly( 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: private:
void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED
@ -1053,7 +1051,6 @@ nsPromiseConcatenation<CharT>::GetReadableFragment( nsReadableFragment<CharT>& a
return result; return result;
} }
#if 0
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1061,7 +1058,7 @@ nsPromiseConcatenation<CharT>::operator+( const basic_nsAReadableString<CharT>&
{ {
return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1); return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1);
} }
#endif
@ -1274,14 +1271,6 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
automatic conversion to a literal string will not happen. 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> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1290,8 +1279,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
#define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \ #define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \
inline \ inline \
@ -1313,7 +1300,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
#define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) #define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT)
#endif #endif
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1322,7 +1308,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsLiteralStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1331,7 +1316,6 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsAReadableStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>

20
xpcom/ds/nsAReadableString.h
Просмотреть файл

@ -950,9 +950,7 @@ class nsPromiseConcatenation
virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const; virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const;
// virtual PRBool PromisesExactly( 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: private:
void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED
@ -1053,7 +1051,6 @@ nsPromiseConcatenation<CharT>::GetReadableFragment( nsReadableFragment<CharT>& a
return result; return result;
} }
#if 0
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1061,7 +1058,7 @@ nsPromiseConcatenation<CharT>::operator+( const basic_nsAReadableString<CharT>&
{ {
return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1); return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1);
} }
#endif
@ -1274,14 +1271,6 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
automatic conversion to a literal string will not happen. 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> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1290,8 +1279,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
#define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \ #define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \
inline \ inline \
@ -1313,7 +1300,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
#define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) #define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT)
#endif #endif
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1322,7 +1308,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsLiteralStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1331,7 +1316,6 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsAReadableStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>

20
xpcom/string/public/nsAReadableString.h
Просмотреть файл

@ -950,9 +950,7 @@ class nsPromiseConcatenation
virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const; virtual PRBool Promises( const basic_nsAReadableString<CharT>& ) const;
// virtual PRBool PromisesExactly( 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: private:
void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED void operator+( const nsPromiseConcatenation<CharT>& ); // NOT TO BE IMPLEMENTED
@ -1053,7 +1051,6 @@ nsPromiseConcatenation<CharT>::GetReadableFragment( nsReadableFragment<CharT>& a
return result; return result;
} }
#if 0
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1061,7 +1058,7 @@ nsPromiseConcatenation<CharT>::operator+( const basic_nsAReadableString<CharT>&
{ {
return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1); return nsPromiseConcatenation<CharT>(*this, rhs, mFragmentIdentifierMask<<1);
} }
#endif
@ -1274,14 +1271,6 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
automatic conversion to a literal string will not happen. 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> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1290,8 +1279,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
#ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
#define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \ #define NS_DEF_DERIVED_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) \
inline \ inline \
@ -1313,7 +1300,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableStr
#define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT) #define NS_DEF_2_STRING_STRING_OPERATOR_PLUS(_String1T, _String2T, _CharT)
#endif #endif
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1322,7 +1308,6 @@ operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsLiteralStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>
@ -1331,7 +1316,6 @@ operator+( const basic_nsLiteralString<CharT>& lhs, const basic_nsAReadableStrin
return nsPromiseConcatenation<CharT>(lhs, rhs); return nsPromiseConcatenation<CharT>(lhs, rhs);
} }
// I believe this operator is now superfluous and can be removed
template <class CharT> template <class CharT>
inline inline
nsPromiseConcatenation<CharT> nsPromiseConcatenation<CharT>