Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AIX requires nsSubsumeStr to be a const... so for AIX (only) lets make it so

Browse Source
This commit is contained in:
jdunn%netscape.com 1999-06-04 22:08:19 +00:00
parent 4301f6ee9f
commit 92ce1bb48a
6 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
string/obsolete/nsString2.cpp
View File

@ -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
}
/**

8
string/obsolete/nsString2.h
View File

@ -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();

13
xpcom/ds/nsString2.cpp
View File

@ -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
}
/**

8
xpcom/ds/nsString2.h
View File

@ -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();

13
xpcom/string/obsolete/nsString2.cpp
View File

@ -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
}
/**

8
xpcom/string/obsolete/nsString2.h
View File

@ -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();