From 5dd484e3e6bca75f16aadaac9099551c4115dc3e Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 3 Sep 2000 01:38:27 +0000
Subject: [PATCH] adding |Concat| function to fix pravda and speedracer bustage

git-svn-id: svn://10.0.0.236/trunk@78049 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/public/nsAReadableString.h     | 23 ++++++++++++++++---
 mozilla/xpcom/ds/nsAReadableString.h          | 23 ++++++++++++++++---
 .../xpcom/string/public/nsAReadableString.h   | 23 ++++++++++++++++---
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/mozilla/string/public/nsAReadableString.h b/mozilla/string/public/nsAReadableString.h
index d11b375ec03..3c071f4dc84 100644
--- a/mozilla/string/public/nsAReadableString.h
+++ b/mozilla/string/public/nsAReadableString.h
@@ -779,7 +779,7 @@ class basic_nsLiteralString
 
     public:
     
-        // Note: _not_ explicit
+      explicit
       basic_nsLiteralString( const CharT* aLiteral )
           : mStart(aLiteral),
             mEnd(mStart ? (mStart + nsCharTraits<CharT>::length(mStart)) : mStart)
@@ -903,6 +903,7 @@ class basic_nsLiteralChar
 
     public:
 
+      explicit
       basic_nsLiteralChar( CharT aChar )
           : mChar(aChar)
         {
@@ -1363,7 +1364,7 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs, lhs.GetFragmentIdentifierMask()<<1);
   }
@@ -1371,11 +1372,27 @@ operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableStri
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs);
   }
 
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
 
 
 #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
diff --git a/mozilla/xpcom/ds/nsAReadableString.h b/mozilla/xpcom/ds/nsAReadableString.h
index d11b375ec03..3c071f4dc84 100644
--- a/mozilla/xpcom/ds/nsAReadableString.h
+++ b/mozilla/xpcom/ds/nsAReadableString.h
@@ -779,7 +779,7 @@ class basic_nsLiteralString
 
     public:
     
-        // Note: _not_ explicit
+      explicit
       basic_nsLiteralString( const CharT* aLiteral )
           : mStart(aLiteral),
             mEnd(mStart ? (mStart + nsCharTraits<CharT>::length(mStart)) : mStart)
@@ -903,6 +903,7 @@ class basic_nsLiteralChar
 
     public:
 
+      explicit
       basic_nsLiteralChar( CharT aChar )
           : mChar(aChar)
         {
@@ -1363,7 +1364,7 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs, lhs.GetFragmentIdentifierMask()<<1);
   }
@@ -1371,11 +1372,27 @@ operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableStri
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs);
   }
 
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
 
 
 #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS
diff --git a/mozilla/xpcom/string/public/nsAReadableString.h b/mozilla/xpcom/string/public/nsAReadableString.h
index d11b375ec03..3c071f4dc84 100644
--- a/mozilla/xpcom/string/public/nsAReadableString.h
+++ b/mozilla/xpcom/string/public/nsAReadableString.h
@@ -779,7 +779,7 @@ class basic_nsLiteralString
 
     public:
     
-        // Note: _not_ explicit
+      explicit
       basic_nsLiteralString( const CharT* aLiteral )
           : mStart(aLiteral),
             mEnd(mStart ? (mStart + nsCharTraits<CharT>::length(mStart)) : mStart)
@@ -903,6 +903,7 @@ class basic_nsLiteralChar
 
     public:
 
+      explicit
       basic_nsLiteralChar( CharT aChar )
           : mChar(aChar)
         {
@@ -1363,7 +1364,7 @@ Compare( const CharT* lhs, const basic_nsAReadableString<CharT>& rhs )
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs, lhs.GetFragmentIdentifierMask()<<1);
   }
@@ -1371,11 +1372,27 @@ operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableStri
 template <class CharT>
 inline
 nsPromiseConcatenation<CharT>
-operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+Concat( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
   {
     return nsPromiseConcatenation<CharT>(lhs, rhs);
   }
 
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const nsPromiseConcatenation<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
+template <class CharT>
+inline
+nsPromiseConcatenation<CharT>
+operator+( const basic_nsAReadableString<CharT>& lhs, const basic_nsAReadableString<CharT>& rhs )
+  {
+    return Concat(lhs, rhs);
+  }
+
 
 
 #ifdef NEED_CPP_DERIVED_TEMPLATE_OPERATORS