From c32b9279300b23f5b5394b0bf2b3ed8a504e2a6f Mon Sep 17 00:00:00 2001 From: "jshin%mailaps.org" Date: Thu, 14 Aug 2003 22:58:02 +0000 Subject: [PATCH] bug 215768: use nsAutoArrayPtr instead of nsAutoPtr in nsUTF8ConverterService.cpp (r=sicking, sr=bzbarsky, a=asa) git-svn-id: svn://10.0.0.236/trunk@146023 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/intl/uconv/src/nsUTF8ConverterService.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mozilla/intl/uconv/src/nsUTF8ConverterService.cpp b/mozilla/intl/uconv/src/nsUTF8ConverterService.cpp index 7242539bd21..0cb916d3e42 100644 --- a/mozilla/intl/uconv/src/nsUTF8ConverterService.cpp +++ b/mozilla/intl/uconv/src/nsUTF8ConverterService.cpp @@ -72,14 +72,13 @@ ToUTF8(const nsACString &aString, const char *aCharset, nsACString &aResult) rv = unicodeDecoder->GetMaxLength(inStr.get(), srcLen, &dstLen); NS_ENSURE_SUCCESS(rv, rv); - nsAutoPtr ustr(new PRUnichar[dstLen]); + nsAutoArrayPtr ustr(new PRUnichar[dstLen]); NS_ENSURE_TRUE(ustr, NS_ERROR_OUT_OF_MEMORY); rv = unicodeDecoder->Convert(inStr.get(), &srcLen, ustr, &dstLen); if (NS_SUCCEEDED(rv)){ - // Tru64 Cxx doesn't like |nsAutoPtr| as the 1st arg. of - // Substring(). - CopyUTF16toUTF8(Substring(NS_STATIC_CAST(PRUnichar *, ustr), ustr + dstLen), aResult); + // Tru64 Cxx and IRIX MIPSpro 7.3 need an explicit get() + CopyUTF16toUTF8(Substring(ustr.get(), ustr + dstLen), aResult); } return rv; }