diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index 6e7fccfaa33..ef07dc930f7 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/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/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index 7e6beddc10c..40024b58fa4 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/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/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index 6e7fccfaa33..ef07dc930f7 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/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/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index 7e6beddc10c..40024b58fa4 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/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/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index 6e7fccfaa33..ef07dc930f7 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/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/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index 7e6beddc10c..40024b58fa4 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/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