зеркало из https://github.com/mozilla/gecko-dev.git
AIX requires nsSubsumeStr to be a const... so for AIX (only) lets make it so
This commit is contained in:
jdunn%netscape.com
Родитель
4301f6ee9f
Коммит
92ce1bb48a
|
|
@ -800,8 +800,14 @@ nsString2& nsString2::Assign(PRUnichar aChar) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsString2& nsString2::operator=(const nsSubsumeStr& aSubsumeString) {
|
||||
nsSubsumeStr temp(aSubsumeString); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsString2& nsString2::operator=(nsSubsumeStr& aSubsumeString) {
|
||||
Subsume(*this,aSubsumeString);
|
||||
#endif // AIX
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
|
@ -1906,9 +1912,16 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
|
|||
* @update gess 1/4/99
|
||||
* @param reference to a subsumeString
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsAutoString2::nsAutoString2(const nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
Subsume(*this,aSubsumeStr);
|
||||
#endif // AIX
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -410,7 +410,11 @@ nsString2& operator=(char aChar) {return Assign(aChar);}
|
|||
nsString2& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString2& operator=(const char* aCString) {return Assign(aCString);}
|
||||
nsString2& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
#ifdef AIX
|
||||
nsString2& operator=(const nsSubsumeStr& aSubsumeString); // AIX requires a const here
|
||||
#else
|
||||
nsString2& operator=(nsSubsumeStr& aSubsumeString);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Here's a bunch of append mehtods for varying types...
|
||||
|
|
@ -749,7 +753,11 @@ public:
|
|||
nsAutoString2(const nsStr& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsAutoString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
#ifdef AIX
|
||||
nsAutoString2(const nsSubsumeStr& aSubsumeStr); // AIX requires a const
|
||||
#else
|
||||
nsAutoString2(nsSubsumeStr& aSubsumeStr);
|
||||
#endif // AIX
|
||||
nsAutoString2(PRUnichar aChar,eCharSize aCharSize=kDefaultCharSize);
|
||||
virtual ~nsAutoString2();
|
||||
|
||||
|
|
|
|||
|
|
@ -800,8 +800,14 @@ nsString2& nsString2::Assign(PRUnichar aChar) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsString2& nsString2::operator=(const nsSubsumeStr& aSubsumeString) {
|
||||
nsSubsumeStr temp(aSubsumeString); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsString2& nsString2::operator=(nsSubsumeStr& aSubsumeString) {
|
||||
Subsume(*this,aSubsumeString);
|
||||
#endif // AIX
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
|
@ -1906,9 +1912,16 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
|
|||
* @update gess 1/4/99
|
||||
* @param reference to a subsumeString
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsAutoString2::nsAutoString2(const nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
Subsume(*this,aSubsumeStr);
|
||||
#endif // AIX
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -410,7 +410,11 @@ nsString2& operator=(char aChar) {return Assign(aChar);}
|
|||
nsString2& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString2& operator=(const char* aCString) {return Assign(aCString);}
|
||||
nsString2& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
#ifdef AIX
|
||||
nsString2& operator=(const nsSubsumeStr& aSubsumeString); // AIX requires a const here
|
||||
#else
|
||||
nsString2& operator=(nsSubsumeStr& aSubsumeString);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Here's a bunch of append mehtods for varying types...
|
||||
|
|
@ -749,7 +753,11 @@ public:
|
|||
nsAutoString2(const nsStr& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsAutoString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
#ifdef AIX
|
||||
nsAutoString2(const nsSubsumeStr& aSubsumeStr); // AIX requires a const
|
||||
#else
|
||||
nsAutoString2(nsSubsumeStr& aSubsumeStr);
|
||||
#endif // AIX
|
||||
nsAutoString2(PRUnichar aChar,eCharSize aCharSize=kDefaultCharSize);
|
||||
virtual ~nsAutoString2();
|
||||
|
||||
|
|
|
|||
|
|
@ -800,8 +800,14 @@ nsString2& nsString2::Assign(PRUnichar aChar) {
|
|||
* @param
|
||||
* @return
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsString2& nsString2::operator=(const nsSubsumeStr& aSubsumeString) {
|
||||
nsSubsumeStr temp(aSubsumeString); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsString2& nsString2::operator=(nsSubsumeStr& aSubsumeString) {
|
||||
Subsume(*this,aSubsumeString);
|
||||
#endif // AIX
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
|
@ -1906,9 +1912,16 @@ nsAutoString2::nsAutoString2(PRUnichar aChar,eCharSize aCharSize) : nsString2(aC
|
|||
* @update gess 1/4/99
|
||||
* @param reference to a subsumeString
|
||||
*/
|
||||
#ifdef AIX
|
||||
nsAutoString2::nsAutoString2(const nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
|
||||
Subsume(*this,temp);
|
||||
#else
|
||||
nsAutoString2::nsAutoString2( nsSubsumeStr& aSubsumeStr) :nsString2(aSubsumeStr.mCharSize) {
|
||||
mAgent=0;
|
||||
Subsume(*this,aSubsumeStr);
|
||||
#endif // AIX
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -410,7 +410,11 @@ nsString2& operator=(char aChar) {return Assign(aChar);}
|
|||
nsString2& operator=(PRUnichar aChar) {return Assign(aChar);}
|
||||
nsString2& operator=(const char* aCString) {return Assign(aCString);}
|
||||
nsString2& operator=(const PRUnichar* aString) {return Assign(aString);}
|
||||
#ifdef AIX
|
||||
nsString2& operator=(const nsSubsumeStr& aSubsumeString); // AIX requires a const here
|
||||
#else
|
||||
nsString2& operator=(nsSubsumeStr& aSubsumeString);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Here's a bunch of append mehtods for varying types...
|
||||
|
|
@ -749,7 +753,11 @@ public:
|
|||
nsAutoString2(const nsStr& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
nsAutoString2(const nsAutoString2& aString,eCharSize aCharSize=kDefaultCharSize);
|
||||
#ifdef AIX
|
||||
nsAutoString2(const nsSubsumeStr& aSubsumeStr); // AIX requires a const
|
||||
#else
|
||||
nsAutoString2(nsSubsumeStr& aSubsumeStr);
|
||||
#endif // AIX
|
||||
nsAutoString2(PRUnichar aChar,eCharSize aCharSize=kDefaultCharSize);
|
||||
virtual ~nsAutoString2();
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче