mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
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:
parent
516103b7f2
commit
2439aac20c
@ -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 */
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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
|
||||
|
@ -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 */
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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
|
||||
|
@ -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 */
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user