From 695113d75ba6aecaa4d48ed45fefb70bff3f8d80 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 2 Sep 2000 12:20:49 +0000
Subject: [PATCH] fix build bustage for hpux

git-svn-id: svn://10.0.0.236/trunk@78017 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/src/nsReadableUtils.cpp       | 10 ++++++++--
 mozilla/xpcom/ds/nsReadableUtils.cpp         | 10 ++++++++--
 mozilla/xpcom/string/src/nsReadableUtils.cpp | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/mozilla/string/src/nsReadableUtils.cpp b/mozilla/string/src/nsReadableUtils.cpp
index 405a011d6e0..e356d39f08b 100755
--- a/mozilla/string/src/nsReadableUtils.cpp
+++ b/mozilla/string/src/nsReadableUtils.cpp
@@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+
     nsWritingIterator<char> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<PRUnichar, char>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<PRUnichar, char> converter(aDest.BeginWriting(toBegin).get());
+    
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }
 
 NS_COM
@@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<char> fromBegin, fromEnd;
+
     nsWritingIterator<PRUnichar> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<char, PRUnichar>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<char, PRUnichar> converter(aDest.BeginWriting(toBegin).get());
+
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }
 
 
diff --git a/mozilla/xpcom/ds/nsReadableUtils.cpp b/mozilla/xpcom/ds/nsReadableUtils.cpp
index 405a011d6e0..e356d39f08b 100755
--- a/mozilla/xpcom/ds/nsReadableUtils.cpp
+++ b/mozilla/xpcom/ds/nsReadableUtils.cpp
@@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+
     nsWritingIterator<char> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<PRUnichar, char>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<PRUnichar, char> converter(aDest.BeginWriting(toBegin).get());
+    
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }
 
 NS_COM
@@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<char> fromBegin, fromEnd;
+
     nsWritingIterator<PRUnichar> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<char, PRUnichar>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<char, PRUnichar> converter(aDest.BeginWriting(toBegin).get());
+
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }
 
 
diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp
index 405a011d6e0..e356d39f08b 100755
--- a/mozilla/xpcom/string/src/nsReadableUtils.cpp
+++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp
@@ -72,8 +72,11 @@ CopyUCS2toASCII( const nsAReadableString& aSource, nsAWritableCString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<PRUnichar> fromBegin, fromEnd;
+
     nsWritingIterator<char> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<PRUnichar, char>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<PRUnichar, char> converter(aDest.BeginWriting(toBegin).get());
+    
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }
 
 NS_COM
@@ -84,8 +87,11 @@ CopyASCIItoUCS2( const nsAReadableCString& aSource, nsAWritableString& aDest )
     aDest.SetLength(aSource.Length());
 
     nsReadingIterator<char> fromBegin, fromEnd;
+
     nsWritingIterator<PRUnichar> toBegin;
-    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), LossyConvertEncoding<char, PRUnichar>(aDest.BeginWriting(toBegin).get()));
+    LossyConvertEncoding<char, PRUnichar> converter(aDest.BeginWriting(toBegin).get());
+
+    copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter);
   }