diff --git a/string/obsolete/nsString.h b/string/obsolete/nsString.h index 446ae5a1e36..ec097d5e541 100644 --- a/string/obsolete/nsString.h +++ b/string/obsolete/nsString.h @@ -794,11 +794,7 @@ private: }; #if 0//def NEW_STRING_APIS -#ifndef STASTANDALONE_STRING_TESTS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&); -#endif -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char) #endif extern NS_COM int fputs(const nsCString& aString, FILE* out); @@ -862,8 +858,7 @@ public: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCAutoString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCAutoString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char) #endif diff --git a/string/obsolete/nsString2.h b/string/obsolete/nsString2.h index c9918e6168c..5152ceebe4c 100644 --- a/string/obsolete/nsString2.h +++ b/string/obsolete/nsString2.h @@ -888,8 +888,7 @@ private: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsString&, const PRUnichar*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const PRUnichar*, const nsString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar) #endif extern NS_COM int fputs(const nsString& aString, FILE* out); diff --git a/string/public/nsAReadableString.h b/string/public/nsAReadableString.h index 68311ac4041..8468929d402 100644 --- a/string/public/nsAReadableString.h +++ b/string/public/nsAReadableString.h @@ -447,36 +447,49 @@ operator!=( const nsReadingIterator& lhs, const nsReadingIterator& } #endif -#define NS_DEF_1_STRING_COMPARISON_OPERATOR(comp, T1, T2) \ - inline \ - PRBool \ - operator comp( T1 lhs, T2 rhs ) \ - { \ - return PRBool(Compare(lhs, rhs) comp 0); \ + +#define NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _StringT& lhs, const _CharT* rhs ) \ + { \ + return PRBool(Compare(NS_READABLE_CAST(_CharT, lhs), rhs) comp 0); \ } -#define NS_DEF_STRING_COMPARISON_OPERATORS(T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _CharT* lhs, const _StringT& rhs ) \ + { \ + return PRBool(Compare(lhs, NS_READABLE_CAST(_CharT, rhs)) comp 0); \ + } -#define NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + template NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + template NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) -#define NS_DEF_STRING_COMPARISONS(T) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const T&, const CharT*) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const CharT*, const T&) +#define NS_DEF_2_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) + +#define NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) + +#define NS_DEF_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) -NS_DEF_STRING_COMPARISONS(basic_nsAReadableString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsAReadableString, CharT) @@ -660,7 +673,7 @@ class basic_nsLiteralString const CharT* mEnd; }; -NS_DEF_STRING_COMPARISONS(basic_nsLiteralString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString, CharT) template const CharT* @@ -858,7 +871,7 @@ class nsPromiseConcatenation PRUint32 mFragmentIdentifierMask; }; -NS_DEF_STRING_COMPARISONS(nsPromiseConcatenation) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation, CharT) template PRUint32 @@ -997,7 +1010,7 @@ class nsPromiseSubstring PRUint32 mLength; }; -NS_DEF_STRING_COMPARISONS(nsPromiseSubstring) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring, CharT) template PRUint32 diff --git a/string/public/nsSharedString.h b/string/public/nsSharedString.h index 24a3d90cc46..534cc903b44 100644 --- a/string/public/nsSharedString.h +++ b/string/public/nsSharedString.h @@ -82,7 +82,7 @@ class basic_nsSharedString size_t mLength; }; -NS_DEF_STRING_COMPARISONS(basic_nsSharedString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsSharedString, CharT) template const CharT* diff --git a/xpcom/ds/nsAReadableString.h b/xpcom/ds/nsAReadableString.h index 68311ac4041..8468929d402 100644 --- a/xpcom/ds/nsAReadableString.h +++ b/xpcom/ds/nsAReadableString.h @@ -447,36 +447,49 @@ operator!=( const nsReadingIterator& lhs, const nsReadingIterator& } #endif -#define NS_DEF_1_STRING_COMPARISON_OPERATOR(comp, T1, T2) \ - inline \ - PRBool \ - operator comp( T1 lhs, T2 rhs ) \ - { \ - return PRBool(Compare(lhs, rhs) comp 0); \ + +#define NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _StringT& lhs, const _CharT* rhs ) \ + { \ + return PRBool(Compare(NS_READABLE_CAST(_CharT, lhs), rhs) comp 0); \ } -#define NS_DEF_STRING_COMPARISON_OPERATORS(T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _CharT* lhs, const _StringT& rhs ) \ + { \ + return PRBool(Compare(lhs, NS_READABLE_CAST(_CharT, rhs)) comp 0); \ + } -#define NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + template NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + template NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) -#define NS_DEF_STRING_COMPARISONS(T) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const T&, const CharT*) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const CharT*, const T&) +#define NS_DEF_2_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) + +#define NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) + +#define NS_DEF_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) -NS_DEF_STRING_COMPARISONS(basic_nsAReadableString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsAReadableString, CharT) @@ -660,7 +673,7 @@ class basic_nsLiteralString const CharT* mEnd; }; -NS_DEF_STRING_COMPARISONS(basic_nsLiteralString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString, CharT) template const CharT* @@ -858,7 +871,7 @@ class nsPromiseConcatenation PRUint32 mFragmentIdentifierMask; }; -NS_DEF_STRING_COMPARISONS(nsPromiseConcatenation) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation, CharT) template PRUint32 @@ -997,7 +1010,7 @@ class nsPromiseSubstring PRUint32 mLength; }; -NS_DEF_STRING_COMPARISONS(nsPromiseSubstring) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring, CharT) template PRUint32 diff --git a/xpcom/ds/nsSharedString.h b/xpcom/ds/nsSharedString.h index 24a3d90cc46..534cc903b44 100644 --- a/xpcom/ds/nsSharedString.h +++ b/xpcom/ds/nsSharedString.h @@ -82,7 +82,7 @@ class basic_nsSharedString size_t mLength; }; -NS_DEF_STRING_COMPARISONS(basic_nsSharedString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsSharedString, CharT) template const CharT* diff --git a/xpcom/ds/nsString.h b/xpcom/ds/nsString.h index 446ae5a1e36..ec097d5e541 100644 --- a/xpcom/ds/nsString.h +++ b/xpcom/ds/nsString.h @@ -794,11 +794,7 @@ private: }; #if 0//def NEW_STRING_APIS -#ifndef STASTANDALONE_STRING_TESTS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&); -#endif -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char) #endif extern NS_COM int fputs(const nsCString& aString, FILE* out); @@ -862,8 +858,7 @@ public: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCAutoString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCAutoString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char) #endif diff --git a/xpcom/ds/nsString2.h b/xpcom/ds/nsString2.h index c9918e6168c..5152ceebe4c 100644 --- a/xpcom/ds/nsString2.h +++ b/xpcom/ds/nsString2.h @@ -888,8 +888,7 @@ private: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsString&, const PRUnichar*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const PRUnichar*, const nsString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar) #endif extern NS_COM int fputs(const nsString& aString, FILE* out); diff --git a/xpcom/string/obsolete/nsString.h b/xpcom/string/obsolete/nsString.h index 446ae5a1e36..ec097d5e541 100644 --- a/xpcom/string/obsolete/nsString.h +++ b/xpcom/string/obsolete/nsString.h @@ -794,11 +794,7 @@ private: }; #if 0//def NEW_STRING_APIS -#ifndef STASTANDALONE_STRING_TESTS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const nsCString&); -#endif -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char) #endif extern NS_COM int fputs(const nsCString& aString, FILE* out); @@ -862,8 +858,7 @@ public: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsCAutoString&, const char*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const char*, const nsCAutoString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsCAutoString, char) #endif diff --git a/xpcom/string/obsolete/nsString2.h b/xpcom/string/obsolete/nsString2.h index c9918e6168c..5152ceebe4c 100644 --- a/xpcom/string/obsolete/nsString2.h +++ b/xpcom/string/obsolete/nsString2.h @@ -888,8 +888,7 @@ private: }; #if 0//def NEW_STRING_APIS -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const nsString&, const PRUnichar*) -NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(const PRUnichar*, const nsString&) +NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar) #endif extern NS_COM int fputs(const nsString& aString, FILE* out); diff --git a/xpcom/string/public/nsAReadableString.h b/xpcom/string/public/nsAReadableString.h index 68311ac4041..8468929d402 100644 --- a/xpcom/string/public/nsAReadableString.h +++ b/xpcom/string/public/nsAReadableString.h @@ -447,36 +447,49 @@ operator!=( const nsReadingIterator& lhs, const nsReadingIterator& } #endif -#define NS_DEF_1_STRING_COMPARISON_OPERATOR(comp, T1, T2) \ - inline \ - PRBool \ - operator comp( T1 lhs, T2 rhs ) \ - { \ - return PRBool(Compare(lhs, rhs) comp 0); \ + +#define NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _StringT& lhs, const _CharT* rhs ) \ + { \ + return PRBool(Compare(NS_READABLE_CAST(_CharT, lhs), rhs) comp 0); \ } -#define NS_DEF_STRING_COMPARISON_OPERATORS(T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - template NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + inline \ + PRBool \ + operator comp( const _CharT* lhs, const _StringT& rhs ) \ + { \ + return PRBool(Compare(lhs, NS_READABLE_CAST(_CharT, rhs)) comp 0); \ + } -#define NS_DEF_NON_TEMPLATE_STRING_COMPARISON_OPERATORS(T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(!=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(< , T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(<=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(==, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(>=, T1, T2) \ - NS_DEF_1_STRING_COMPARISON_OPERATOR(> , T1, T2) +#define NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + template NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + template NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) -#define NS_DEF_STRING_COMPARISONS(T) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const T&, const CharT*) \ - NS_DEF_STRING_COMPARISON_OPERATORS(const CharT*, const T&) +#define NS_DEF_2_STRING_COMPARISON_OPERATORS(comp, _StringT, _CharT) \ + NS_DEF_1_STRING_PTR_COMPARISON_OPERATOR(comp, _StringT, _CharT) \ + NS_DEF_1_PTR_STRING_COMPARISON_OPERATOR(comp, _StringT, _CharT) + +#define NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_TEMPLATE_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) + +#define NS_DEF_STRING_COMPARISON_OPERATORS(_StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(!=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(< , _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(<=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(==, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(>=, _StringT, _CharT) \ + NS_DEF_2_STRING_COMPARISON_OPERATORS(> , _StringT, _CharT) -NS_DEF_STRING_COMPARISONS(basic_nsAReadableString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsAReadableString, CharT) @@ -660,7 +673,7 @@ class basic_nsLiteralString const CharT* mEnd; }; -NS_DEF_STRING_COMPARISONS(basic_nsLiteralString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsLiteralString, CharT) template const CharT* @@ -858,7 +871,7 @@ class nsPromiseConcatenation PRUint32 mFragmentIdentifierMask; }; -NS_DEF_STRING_COMPARISONS(nsPromiseConcatenation) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseConcatenation, CharT) template PRUint32 @@ -997,7 +1010,7 @@ class nsPromiseSubstring PRUint32 mLength; }; -NS_DEF_STRING_COMPARISONS(nsPromiseSubstring) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(nsPromiseSubstring, CharT) template PRUint32 diff --git a/xpcom/string/public/nsSharedString.h b/xpcom/string/public/nsSharedString.h index 24a3d90cc46..534cc903b44 100644 --- a/xpcom/string/public/nsSharedString.h +++ b/xpcom/string/public/nsSharedString.h @@ -82,7 +82,7 @@ class basic_nsSharedString size_t mLength; }; -NS_DEF_STRING_COMPARISONS(basic_nsSharedString) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsSharedString, CharT) template const CharT* diff --git a/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h b/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h index 4442b74a124..c869c71db88 100644 --- a/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h +++ b/xpcom/tests/StringFactoringTests/nsStdStringWrapper.h @@ -144,7 +144,7 @@ class basic_nsStdStringWrapper // ... }; -NS_DEF_STRING_COMPARISONS(basic_nsStdStringWrapper) +NS_DEF_TEMPLATE_STRING_COMPARISON_OPERATORS(basic_nsStdStringWrapper, CharT)