From b5f45095b1b1c33a0e16142dde14fdbd7baa6fb0 Mon Sep 17 00:00:00 2001
From: "tague%netscape.com"
 <tague%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 20 Mar 1999 02:42:18 +0000
Subject: [PATCH] Fixed purify errors. Thanks to bruce@cybersight.com for the
 patches.

git-svn-id: svn://10.0.0.236/trunk@24570 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/intl/locale/src/nsLocale.h                   | 2 +-
 mozilla/intl/locale/src/unix/nsLocaleFactoryUnix.h   | 2 +-
 mozilla/intl/uconv/src/nsCharsetConverterManager.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/intl/locale/src/nsLocale.h b/mozilla/intl/locale/src/nsLocale.h
index 28b0159db5e..fc507597feb 100644
--- a/mozilla/intl/locale/src/nsLocale.h
+++ b/mozilla/intl/locale/src/nsLocale.h
@@ -31,7 +31,7 @@ class nsLocale : public nsILocale {
 public:
 	
 	nsLocale(nsString** catagoryList,nsString** valueList, PRUint32 count);
-	~nsLocale(void);
+	virtual ~nsLocale(void);
 	
 	NS_IMETHOD GetCatagory(const nsString* catagory, nsString* result);
 
diff --git a/mozilla/intl/locale/src/unix/nsLocaleFactoryUnix.h b/mozilla/intl/locale/src/unix/nsLocaleFactoryUnix.h
index a6a59a920c5..169294d119f 100644
--- a/mozilla/intl/locale/src/unix/nsLocaleFactoryUnix.h
+++ b/mozilla/intl/locale/src/unix/nsLocaleFactoryUnix.h
@@ -41,7 +41,7 @@ class nsLocaleUnixFactory : public nsIFactory
     NS_IMETHOD LockFactory(PRBool aLock);   
 
     nsLocaleUnixFactory(const nsCID &aClass);   
-    ~nsLocaleUnixFactory();   
+    virtual ~nsLocaleUnixFactory();   
 
   private:   
     nsrefcnt  mRefCnt;   
diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
index 869785fb794..49d7e6018b5 100644
--- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
+++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp
@@ -294,7 +294,7 @@ nsresult nsCharsetConverterManager::GetCharsetConverter(
                                     const ConverterInfo * aArray,
                                     PRInt32 aSize)
 {
-  nsresult res;
+  nsresult res = NS_ERROR_UCONV_NOCONV;
   nsString * str;
   GetCharsetName(aSrc, &str);