зеркало из https://github.com/mozilla/gecko-dev.git
fixing ambiguities caused by name hiding
This commit is contained in:
scc%netscape.com
Родитель
048759be2a
Коммит
be782b8db1
|
|
@ -420,6 +420,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator=;
|
||||
#else
|
||||
nsCString& operator=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
|
|
@ -440,6 +447,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator+=;
|
||||
#else
|
||||
nsCString& operator+=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const char aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const int anInt){return Append(anInt,10);}
|
||||
|
|
|
|||
|
|
@ -466,6 +466,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator=;
|
||||
#else
|
||||
nsString& operator=( const nsAReadableString& aReadable ) { nsAWritableString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString& operator=(const char* aCString) {return Assign(aCString);}
|
||||
|
|
@ -486,6 +493,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator+=;
|
||||
#else
|
||||
nsString& operator+=( const nsAReadableString& aReadable ) { nsAWritableString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator+=(const char* aCString) {return Append(aCString);}
|
||||
nsString& operator+=(const char aChar) {
|
||||
return Append((PRUnichar) (unsigned char)aChar);
|
||||
|
|
|
|||
|
|
@ -420,6 +420,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator=;
|
||||
#else
|
||||
nsCString& operator=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
|
|
@ -440,6 +447,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator+=;
|
||||
#else
|
||||
nsCString& operator+=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const char aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const int anInt){return Append(anInt,10);}
|
||||
|
|
|
|||
|
|
@ -466,6 +466,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator=;
|
||||
#else
|
||||
nsString& operator=( const nsAReadableString& aReadable ) { nsAWritableString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString& operator=(const char* aCString) {return Assign(aCString);}
|
||||
|
|
@ -486,6 +493,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator+=;
|
||||
#else
|
||||
nsString& operator+=( const nsAReadableString& aReadable ) { nsAWritableString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator+=(const char* aCString) {return Append(aCString);}
|
||||
nsString& operator+=(const char aChar) {
|
||||
return Append((PRUnichar) (unsigned char)aChar);
|
||||
|
|
|
|||
|
|
@ -420,6 +420,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator=;
|
||||
#else
|
||||
nsCString& operator=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsCString& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
|
|
@ -440,6 +447,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableCString::operator+=;
|
||||
#else
|
||||
nsCString& operator+=( const nsAReadableCString& aReadable ) { nsAWritableCString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsCString& operator+=(const PRUnichar aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const char aChar){return Append(aChar);}
|
||||
nsCString& operator+=(const int anInt){return Append(anInt,10);}
|
||||
|
|
|
|||
|
|
@ -466,6 +466,13 @@ public:
|
|||
* @param aString: string to be added to this
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator=;
|
||||
#else
|
||||
nsString& operator=( const nsAReadableString& aReadable ) { nsAWritableString::operator=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator=(char aChar) {return Assign(aChar);}
|
||||
nsString& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString& operator=(const char* aCString) {return Assign(aCString);}
|
||||
|
|
@ -486,6 +493,13 @@ public:
|
|||
* @param various...
|
||||
* @return this
|
||||
*/
|
||||
#ifdef NEW_STRING_APIS
|
||||
#ifdef HAVE_CPP_USING
|
||||
using nsAWritableString::operator+=;
|
||||
#else
|
||||
nsString& operator+=( const nsAReadableString& aReadable ) { nsAWritableString::operator+=(aReadable); return *this; }
|
||||
#endif
|
||||
#endif
|
||||
nsString& operator+=(const char* aCString) {return Append(aCString);}
|
||||
nsString& operator+=(const char aChar) {
|
||||
return Append((PRUnichar) (unsigned char)aChar);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче