From c29277323916141225843ccb3628dbc7b5592e24 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 3 Sep 2000 22:38:38 +0000
Subject: [PATCH] bustage fix for old gcc; already built on speedracer to
 ensure that it works, and on Mac to ensure that doesn't break modern
 compilers

git-svn-id: svn://10.0.0.236/trunk@78083 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsString.h        | 2 ++
 mozilla/string/obsolete/nsString2.h       | 2 ++
 mozilla/xpcom/ds/nsString.h               | 2 ++
 mozilla/xpcom/ds/nsString2.h              | 2 ++
 mozilla/xpcom/string/obsolete/nsString.h  | 2 ++
 mozilla/xpcom/string/obsolete/nsString2.h | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index 3b097d70adc..0f6d884fe86 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -544,6 +544,8 @@ public:
     char mBuffer[kDefaultStringSize];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+
 /**
  * A helper class that converts a UCS2 string to UTF8
  */
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index 5f11ea6b585..6b9b906618d 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -620,6 +620,8 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString
     /*
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index 3b097d70adc..0f6d884fe86 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -544,6 +544,8 @@ public:
     char mBuffer[kDefaultStringSize];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+
 /**
  * A helper class that converts a UCS2 string to UTF8
  */
diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h
index 5f11ea6b585..6b9b906618d 100644
--- a/mozilla/xpcom/ds/nsString2.h
+++ b/mozilla/xpcom/ds/nsString2.h
@@ -620,6 +620,8 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString
     /*
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index 3b097d70adc..0f6d884fe86 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -544,6 +544,8 @@ public:
     char mBuffer[kDefaultStringSize];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsCAutoString, char)
+
 /**
  * A helper class that converts a UCS2 string to UTF8
  */
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index 5f11ea6b585..6b9b906618d 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -620,6 +620,8 @@ public:
     char mBuffer[kDefaultStringSize<<eTwoByte];
 };
 
+NS_DEF_DERIVED_STRING_OPERATOR_PLUS(nsAutoString, PRUnichar)
+
 class NS_COM NS_ConvertASCIItoUCS2
       : public nsAutoString
     /*