From 79d6fa2d05d455fce45432d6c955b70979bb8d9a Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Fri, 28 Apr 2000 00:21:44 +0000 Subject: [PATCH] fix for pink git-svn-id: svn://10.0.0.236/trunk@67446 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString.cpp | 5 +---- mozilla/string/obsolete/nsString.h | 2 +- mozilla/xpcom/ds/nsString.cpp | 5 +---- mozilla/xpcom/ds/nsString.h | 2 +- mozilla/xpcom/string/obsolete/nsString.cpp | 5 +---- mozilla/xpcom/string/obsolete/nsString.h | 2 +- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp index 31ee0d55634..ad9461f4b8c 100644 --- a/mozilla/string/obsolete/nsString.cpp +++ b/mozilla/string/obsolete/nsString.cpp @@ -1874,10 +1874,7 @@ nsCAutoString::nsCAutoString() : nsCString(){ } -/** - * Default constructor - */ -nsCAutoString::nsCAutoString(const nsCAutoString& aString) : nsCString() { +nsCAutoString::nsCAutoString( const nsCString& aString ) : nsCString(){ Initialize(*this,mBuffer,sizeof(mBuffer)-1,0,eOneByte,PR_FALSE); AddNullTerminator(*this); Append(aString); diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h index 5b3127043ba..6c01c9205a5 100644 --- a/mozilla/string/obsolete/nsString.h +++ b/mozilla/string/obsolete/nsString.h @@ -803,7 +803,7 @@ public: virtual ~nsCAutoString(); nsCAutoString(); - nsCAutoString(const nsCAutoString& aString); + nsCAutoString(const nsCString& ); nsCAutoString(const char* aString,PRInt32 aLength=-1); nsCAutoString(const CBufDescriptor& aBuffer); diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp index 31ee0d55634..ad9461f4b8c 100644 --- a/mozilla/xpcom/ds/nsString.cpp +++ b/mozilla/xpcom/ds/nsString.cpp @@ -1874,10 +1874,7 @@ nsCAutoString::nsCAutoString() : nsCString(){ } -/** - * Default constructor - */ -nsCAutoString::nsCAutoString(const nsCAutoString& aString) : nsCString() { +nsCAutoString::nsCAutoString( const nsCString& aString ) : nsCString(){ Initialize(*this,mBuffer,sizeof(mBuffer)-1,0,eOneByte,PR_FALSE); AddNullTerminator(*this); Append(aString); diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h index 5b3127043ba..6c01c9205a5 100644 --- a/mozilla/xpcom/ds/nsString.h +++ b/mozilla/xpcom/ds/nsString.h @@ -803,7 +803,7 @@ public: virtual ~nsCAutoString(); nsCAutoString(); - nsCAutoString(const nsCAutoString& aString); + nsCAutoString(const nsCString& ); nsCAutoString(const char* aString,PRInt32 aLength=-1); nsCAutoString(const CBufDescriptor& aBuffer); diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp index 31ee0d55634..ad9461f4b8c 100644 --- a/mozilla/xpcom/string/obsolete/nsString.cpp +++ b/mozilla/xpcom/string/obsolete/nsString.cpp @@ -1874,10 +1874,7 @@ nsCAutoString::nsCAutoString() : nsCString(){ } -/** - * Default constructor - */ -nsCAutoString::nsCAutoString(const nsCAutoString& aString) : nsCString() { +nsCAutoString::nsCAutoString( const nsCString& aString ) : nsCString(){ Initialize(*this,mBuffer,sizeof(mBuffer)-1,0,eOneByte,PR_FALSE); AddNullTerminator(*this); Append(aString); diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h index 5b3127043ba..6c01c9205a5 100644 --- a/mozilla/xpcom/string/obsolete/nsString.h +++ b/mozilla/xpcom/string/obsolete/nsString.h @@ -803,7 +803,7 @@ public: virtual ~nsCAutoString(); nsCAutoString(); - nsCAutoString(const nsCAutoString& aString); + nsCAutoString(const nsCString& ); nsCAutoString(const char* aString,PRInt32 aLength=-1); nsCAutoString(const CBufDescriptor& aBuffer);