diff --git a/mozilla/base/src/nsString2.cpp b/mozilla/base/src/nsString2.cpp index 0766266783e..c44bce4ee0f 100644 --- a/mozilla/base/src/nsString2.cpp +++ b/mozilla/base/src/nsString2.cpp @@ -211,7 +211,7 @@ nsString2::nsString2(const nsStr &aString,eCharSize aCharSize,nsIMemoryAgent* an * @param reference to another nsString2 */ nsString2::nsString2(const nsString2& aString) :mAgent(aString.mAgent) { - nsStr::Initialize(*this,aString.mMultibyte); + nsStr::Initialize(*this,(eCharSize)aString.mMultibyte); nsStr::Assign(*this,aString,0,aString.mLength,mAgent); } diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index 0766266783e..c44bce4ee0f 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -211,7 +211,7 @@ nsString2::nsString2(const nsStr &aString,eCharSize aCharSize,nsIMemoryAgent* an * @param reference to another nsString2 */ nsString2::nsString2(const nsString2& aString) :mAgent(aString.mAgent) { - nsStr::Initialize(*this,aString.mMultibyte); + nsStr::Initialize(*this,(eCharSize)aString.mMultibyte); nsStr::Assign(*this,aString,0,aString.mLength,mAgent); } diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index 0766266783e..c44bce4ee0f 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -211,7 +211,7 @@ nsString2::nsString2(const nsStr &aString,eCharSize aCharSize,nsIMemoryAgent* an * @param reference to another nsString2 */ nsString2::nsString2(const nsString2& aString) :mAgent(aString.mAgent) { - nsStr::Initialize(*this,aString.mMultibyte); + nsStr::Initialize(*this,(eCharSize)aString.mMultibyte); nsStr::Assign(*this,aString,0,aString.mLength,mAgent); } diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index 0766266783e..c44bce4ee0f 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -211,7 +211,7 @@ nsString2::nsString2(const nsStr &aString,eCharSize aCharSize,nsIMemoryAgent* an * @param reference to another nsString2 */ nsString2::nsString2(const nsString2& aString) :mAgent(aString.mAgent) { - nsStr::Initialize(*this,aString.mMultibyte); + nsStr::Initialize(*this,(eCharSize)aString.mMultibyte); nsStr::Assign(*this,aString,0,aString.mLength,mAgent); }