From c38e567e72015177dd8b488f85bf0cb8dc1af23d Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 25 Apr 1999 01:49:58 +0000
Subject: [PATCH] fix to nsString2 constructor

git-svn-id: svn://10.0.0.236/trunk@29093 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/base/src/nsString2.cpp              | 2 +-
 mozilla/string/obsolete/nsString2.cpp       | 2 +-
 mozilla/xpcom/ds/nsString2.cpp              | 2 +-
 mozilla/xpcom/string/obsolete/nsString2.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp
index ab7c0299a8f..c661c7b27ef 100644
--- a/mozilla/base/src/nsString2.cpp
+++ b/mozilla/base/src/nsString2.cpp
@@ -2037,7 +2037,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   anExtBuffer describes an external buffer
  * @param   aCString is a ptr to a 1-byte cstr
  */
-nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2(aStr.mMultibyte) {
+nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index ab7c0299a8f..c661c7b27ef 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -2037,7 +2037,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   anExtBuffer describes an external buffer
  * @param   aCString is a ptr to a 1-byte cstr
  */
-nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2(aStr.mMultibyte) {
+nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index ab7c0299a8f..c661c7b27ef 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -2037,7 +2037,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   anExtBuffer describes an external buffer
  * @param   aCString is a ptr to a 1-byte cstr
  */
-nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2(aStr.mMultibyte) {
+nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index ab7c0299a8f..c661c7b27ef 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -2037,7 +2037,7 @@ nsAutoString2::nsAutoString2(eCharSize aCharSize) : nsString2(aCharSize){
  * @param   anExtBuffer describes an external buffer
  * @param   aCString is a ptr to a 1-byte cstr
  */
-nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2(aStr.mMultibyte) {
+nsAutoString2::nsAutoString2(nsStr& aStr,const char* aCString) : nsString2((eCharSize)aStr.mMultibyte) {
   nsStr::Initialize(*this,mBuffer,(sizeof(mBuffer)>>aStr.mMultibyte)-1,0,aStr.mMultibyte,PR_FALSE);
   mAgent=0;
   AddNullTerminator(*this);