adding back a couple more |operator+|s for gcc

string/obsolete/nsString.h

@@ -495,6 +495,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);

string/obsolete/nsString2.h

@@ -571,6 +571,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);

xpcom/ds/nsString.h

@@ -495,6 +495,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);

xpcom/ds/nsString2.h

@@ -571,6 +571,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);

xpcom/string/obsolete/nsString.h

@@ -495,6 +495,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsCString, char)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCString, char)
 
 extern NS_COM int fputs(const nsCString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsCString& aString);

xpcom/string/obsolete/nsString2.h

@@ -571,6 +571,7 @@ private:
 };
 
 // NS_DEF_STRING_COMPARISON_OPERATORS(nsString, PRUnichar)
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsString, PRUnichar)
 
 extern NS_COM int fputs(const nsString& aString, FILE* out);
 //ostream& operator<<(ostream& aStream,const nsString& aString);