From 87f76caceaabb53f4de41379918cf1fa161245b4 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 3 May 2001 10:15:09 +0000
Subject: [PATCH] bug #75504; sr=jband.  making it impossible to misuse
 |getter_AddRefs| in the way jband discovered

git-svn-id: svn://10.0.0.236/trunk@93789 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/base/nsCOMPtr.h | 5 +----
 mozilla/xpcom/glue/nsCOMPtr.h | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/mozilla/xpcom/base/nsCOMPtr.h b/mozilla/xpcom/base/nsCOMPtr.h
index eeb1125fb23..be39e2d2292 100644
--- a/mozilla/xpcom/base/nsCOMPtr.h
+++ b/mozilla/xpcom/base/nsCOMPtr.h
@@ -236,10 +236,7 @@ struct already_AddRefed
         // nothing else to do here
       }
 
-    operator T*() const
-      {
-        return mRawPtr;
-      }
+    T* get() const { return mRawPtr; }
 
     T* mRawPtr;
   };
diff --git a/mozilla/xpcom/glue/nsCOMPtr.h b/mozilla/xpcom/glue/nsCOMPtr.h
index eeb1125fb23..be39e2d2292 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.h
+++ b/mozilla/xpcom/glue/nsCOMPtr.h
@@ -236,10 +236,7 @@ struct already_AddRefed
         // nothing else to do here
       }
 
-    operator T*() const
-      {
-        return mRawPtr;
-      }
+    T* get() const { return mRawPtr; }
 
     T* mRawPtr;
   };