From d029bb7e31f2a270b3f256d12f6c683ea86d8e1e Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 20 May 2000 19:08:36 +0000
Subject: [PATCH] ugh.  Fix to placate egcs.  |static_cast| should be
 sufficient for a |void*|, but egcs seems to need |reinterpret_cast|

git-svn-id: svn://10.0.0.236/trunk@70558 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/public/nsCharTraits.h       | 4 ++--
 mozilla/xpcom/ds/nsCharTraits.h            | 4 ++--
 mozilla/xpcom/string/public/nsCharTraits.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mozilla/string/public/nsCharTraits.h b/mozilla/string/public/nsCharTraits.h
index fe0376e8fe0..116198d1c5e 100644
--- a/mozilla/string/public/nsCharTraits.h
+++ b/mozilla/string/public/nsCharTraits.h
@@ -307,7 +307,7 @@ struct nsCharTraits<char>
     const char*
     find( const char* s, size_t n, char c )
       {
-        return NS_STATIC_CAST(const char*, memchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const char*, memchr(s, to_int_type(c), n));
       }
 
 #if 0
@@ -433,7 +433,7 @@ struct nsCharTraits<wchar_t>
     const wchar_t*
     find( const wchar_t* s, size_t n, wchar_t c )
       {
-        return NS_STATIC_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
       }
 
 #if 0
diff --git a/mozilla/xpcom/ds/nsCharTraits.h b/mozilla/xpcom/ds/nsCharTraits.h
index fe0376e8fe0..116198d1c5e 100644
--- a/mozilla/xpcom/ds/nsCharTraits.h
+++ b/mozilla/xpcom/ds/nsCharTraits.h
@@ -307,7 +307,7 @@ struct nsCharTraits<char>
     const char*
     find( const char* s, size_t n, char c )
       {
-        return NS_STATIC_CAST(const char*, memchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const char*, memchr(s, to_int_type(c), n));
       }
 
 #if 0
@@ -433,7 +433,7 @@ struct nsCharTraits<wchar_t>
     const wchar_t*
     find( const wchar_t* s, size_t n, wchar_t c )
       {
-        return NS_STATIC_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
       }
 
 #if 0
diff --git a/mozilla/xpcom/string/public/nsCharTraits.h b/mozilla/xpcom/string/public/nsCharTraits.h
index fe0376e8fe0..116198d1c5e 100644
--- a/mozilla/xpcom/string/public/nsCharTraits.h
+++ b/mozilla/xpcom/string/public/nsCharTraits.h
@@ -307,7 +307,7 @@ struct nsCharTraits<char>
     const char*
     find( const char* s, size_t n, char c )
       {
-        return NS_STATIC_CAST(const char*, memchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const char*, memchr(s, to_int_type(c), n));
       }
 
 #if 0
@@ -433,7 +433,7 @@ struct nsCharTraits<wchar_t>
     const wchar_t*
     find( const wchar_t* s, size_t n, wchar_t c )
       {
-        return NS_STATIC_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
+        return NS_REINTERPRET_CAST(const wchar_t*, wmemchr(s, to_int_type(c), n));
       }
 
 #if 0