AIX requires a 'const' in order to handle the assignment of 2 nsStrings

(see wallet.cpp line 3093).

rickg approved
This commit is contained in:
jdunn%netscape.com 1999-11-12 03:58:15 +00:00
parent 516103b7f2
commit 2439aac20c
6 changed files with 39 additions and 0 deletions

View File

@ -113,9 +113,18 @@ nsString::nsString(const nsString& aString) {
* @update gess 1/4/99
* @param reference to a subsumeString
*/
#ifdef AIX
nsString::nsString(const nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
Subsume(*this,temp);
#else
nsString::nsString(nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
Subsume(*this,aSubsumeStr);
#endif /* AIX */
}
/**

View File

@ -93,7 +93,11 @@ public:
* This constructor takes a subsumestr
* @param reference to subsumestr
*/
#ifdef AIX
nsString(const nsSubsumeStr& aSubsumeStr); // AIX requires a const here
#else
nsString(nsSubsumeStr& aSubsumeStr);
#endif
/**
* Destructor

View File

@ -113,9 +113,18 @@ nsString::nsString(const nsString& aString) {
* @update gess 1/4/99
* @param reference to a subsumeString
*/
#ifdef AIX
nsString::nsString(const nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
Subsume(*this,temp);
#else
nsString::nsString(nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
Subsume(*this,aSubsumeStr);
#endif /* AIX */
}
/**

View File

@ -93,7 +93,11 @@ public:
* This constructor takes a subsumestr
* @param reference to subsumestr
*/
#ifdef AIX
nsString(const nsSubsumeStr& aSubsumeStr); // AIX requires a const here
#else
nsString(nsSubsumeStr& aSubsumeStr);
#endif
/**
* Destructor

View File

@ -113,9 +113,18 @@ nsString::nsString(const nsString& aString) {
* @update gess 1/4/99
* @param reference to a subsumeString
*/
#ifdef AIX
nsString::nsString(const nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
nsSubsumeStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
Subsume(*this,temp);
#else
nsString::nsString(nsSubsumeStr& aSubsumeStr) {
nsStr::Initialize(*this,eTwoByte);
Subsume(*this,aSubsumeStr);
#endif /* AIX */
}
/**

View File

@ -93,7 +93,11 @@ public:
* This constructor takes a subsumestr
* @param reference to subsumestr
*/
#ifdef AIX
nsString(const nsSubsumeStr& aSubsumeStr); // AIX requires a const here
#else
nsString(nsSubsumeStr& aSubsumeStr);
#endif
/**
* Destructor