Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# 37239

Browse Source 
r= dougt@netscape.com
OS/2 bring up continues - xpcom changes - #ifdefs for OS/2


git-svn-id: svn://10.0.0.236/trunk@67765 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2000-05-01 22:25:44 +00:00
parent 0781f6f80c
commit aeefaeec2e
11 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/xpcom/string/obsolete/nsString.cpp
View File

@@ -889,14 +889,14 @@ nsCString& nsCString::Assign(char aChar) {
* @param
* @return
*/
#ifdef AIX
#if defined(AIX) || defined(XP_OS2_VACPP)
nsCString& nsCString::operator=(const nsSubsumeCStr& aSubsumeString) {
nsSubsumeCStr temp(aSubsumeString); // a temp is needed for the AIX compiler
nsSubsumeCStr temp(aSubsumeString); // a temp is needed for the AIX and VAC++ compiler
CSubsume(*this,temp);
#else
nsCString& nsCString::operator=(nsSubsumeCStr& aSubsumeString) {
CSubsume(*this,aSubsumeString);
#endif // AIX
#endif // AIX || XP_OS2_VACPP
return *this;
}
#endif
@@ -1946,14 +1946,14 @@ nsCAutoString::nsCAutoString(PRUnichar aChar) : nsCString(){
* @update gess 1/4/99
* @param reference to a subsumeString
*/
#ifdef AIX
#if defined(AIX) || defined(XP_OS2_VACPP)
nsCAutoString::nsCAutoString(const nsSubsumeCStr& aSubsumeStr) :nsCString() {
nsSubsumeCStr temp(aSubsumeStr); // a temp is needed for the AIX compiler
nsSubsumeCStr temp(aSubsumeStr); // a temp is needed for the AIX and VAC++ compilers
CSubsume(*this,temp);
#else
nsCAutoString::nsCAutoString( nsSubsumeCStr& aSubsumeStr) :nsCString() {
CSubsume(*this,aSubsumeStr);
#endif // AIX
#endif // AIX || XP_OS2_VACPP
}
/**