From cd34e5b36eade86436ba65123457f94f23a3b6a2 Mon Sep 17 00:00:00 2001 From: "tbogard%aol.net" Date: Sat, 22 Apr 2000 09:17:20 +0000 Subject: [PATCH] Moved the implementation of AssignWithConversion to the cpp file since Linux and Windows didn't like it inline in the h file. r=scc --- string/obsolete/nsString.cpp | 5 +++++ string/obsolete/nsString.h | 2 +- xpcom/ds/nsString.cpp | 5 +++++ xpcom/ds/nsString.h | 2 +- xpcom/string/obsolete/nsString.cpp | 5 +++++ xpcom/string/obsolete/nsString.h | 2 +- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/string/obsolete/nsString.cpp b/string/obsolete/nsString.cpp index 6e7fccfaa33e..ef07dc930f7b 100644 --- a/string/obsolete/nsString.cpp +++ b/string/obsolete/nsString.cpp @@ -938,6 +938,11 @@ void nsCString::AssignWithConversion(const PRUnichar* aString,PRInt32 aCount) { } } +void nsCString::AssignWithConversion( const nsString& aString ) { + AssignWithConversion(aString.GetUnicode(), aString.Length()); +} + + /** * assign given unichar to this string diff --git a/string/obsolete/nsString.h b/string/obsolete/nsString.h index 7e6beddc10ca..40024b58fa44 100644 --- a/string/obsolete/nsString.h +++ b/string/obsolete/nsString.h @@ -403,7 +403,7 @@ public: */ void AssignWithConversion(const PRUnichar*,PRInt32=-1); - void AssignWithConversion( const nsString& aString ) { AssignWithConversion(aString.GetUnicode(), aString.Length()); } + void AssignWithConversion( const nsString& aString ); void AssignWithConversion(PRUnichar); #ifndef NEW_STRING_APIS diff --git a/xpcom/ds/nsString.cpp b/xpcom/ds/nsString.cpp index 6e7fccfaa33e..ef07dc930f7b 100644 --- a/xpcom/ds/nsString.cpp +++ b/xpcom/ds/nsString.cpp @@ -938,6 +938,11 @@ void nsCString::AssignWithConversion(const PRUnichar* aString,PRInt32 aCount) { } } +void nsCString::AssignWithConversion( const nsString& aString ) { + AssignWithConversion(aString.GetUnicode(), aString.Length()); +} + + /** * assign given unichar to this string diff --git a/xpcom/ds/nsString.h b/xpcom/ds/nsString.h index 7e6beddc10ca..40024b58fa44 100644 --- a/xpcom/ds/nsString.h +++ b/xpcom/ds/nsString.h @@ -403,7 +403,7 @@ public: */ void AssignWithConversion(const PRUnichar*,PRInt32=-1); - void AssignWithConversion( const nsString& aString ) { AssignWithConversion(aString.GetUnicode(), aString.Length()); } + void AssignWithConversion( const nsString& aString ); void AssignWithConversion(PRUnichar); #ifndef NEW_STRING_APIS diff --git a/xpcom/string/obsolete/nsString.cpp b/xpcom/string/obsolete/nsString.cpp index 6e7fccfaa33e..ef07dc930f7b 100644 --- a/xpcom/string/obsolete/nsString.cpp +++ b/xpcom/string/obsolete/nsString.cpp @@ -938,6 +938,11 @@ void nsCString::AssignWithConversion(const PRUnichar* aString,PRInt32 aCount) { } } +void nsCString::AssignWithConversion( const nsString& aString ) { + AssignWithConversion(aString.GetUnicode(), aString.Length()); +} + + /** * assign given unichar to this string diff --git a/xpcom/string/obsolete/nsString.h b/xpcom/string/obsolete/nsString.h index 7e6beddc10ca..40024b58fa44 100644 --- a/xpcom/string/obsolete/nsString.h +++ b/xpcom/string/obsolete/nsString.h @@ -403,7 +403,7 @@ public: */ void AssignWithConversion(const PRUnichar*,PRInt32=-1); - void AssignWithConversion( const nsString& aString ) { AssignWithConversion(aString.GetUnicode(), aString.Length()); } + void AssignWithConversion( const nsString& aString ); void AssignWithConversion(PRUnichar); #ifndef NEW_STRING_APIS