From 9c2f450854636f9ca2ab61665320a51f08dbcf4c Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com" <kipp%netscape.com>
Date: Sat, 12 Sep 1998 19:26:52 +0000
Subject: [PATCH] Use NS_ADDREF/NS_RELEASE macros

---
 xpcom/src/nsAgg.h  |  2 +-
 xpcom/src/nsIPtr.h | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/xpcom/src/nsAgg.h b/xpcom/src/nsAgg.h
index 0a2e70d6d2c2..df17193f1616 100644
--- a/xpcom/src/nsAgg.h
+++ b/xpcom/src/nsAgg.h
@@ -109,7 +109,7 @@ _class::AddRef(void)                                                        \
 {                                                                           \
     ++mRefCnt; /* keep track of our refcount as well as outer's */          \
     if (fOuter)                                                             \
-        return fOuter->AddRef();                                            \
+        return NS_ADDREF(fOuter);                                           \
     else                                                                    \
         return mRefCnt;                                                     \
 }                                                                           \
diff --git a/xpcom/src/nsIPtr.h b/xpcom/src/nsIPtr.h
index bac6323ac002..d537b00157bc 100644
--- a/xpcom/src/nsIPtr.h
+++ b/xpcom/src/nsIPtr.h
@@ -81,34 +81,34 @@ class cls##Ptr {                                                              \
 public:                                                                       \
   cls##Ptr(void)  : mPtr(0) {}                                                \
   cls##Ptr(const cls##Ptr& aCopy) : mPtr(aCopy.mPtr)                          \
-    { if(0 != mPtr)  mPtr->AddRef();  }                                       \
+    { NS_IF_ADDREF(mPtr);  }                                                  \
   cls##Ptr(cls* aInterface)       : mPtr(aInterface)  {}                      \
-  ~cls##Ptr(void)     { if(0 != mPtr)  mPtr->Release();  }                    \
+  ~cls##Ptr(void)     { NS_IF_RELEASE(mPtr);  }                               \
   cls##Ptr& operator=(const cls##Ptr& aCopy)                                  \
     { if(mPtr == aCopy.mPtr) return *this;                                    \
-      if(0 != aCopy.mPtr)  aCopy.mPtr->AddRef();                              \
-      if(0 != mPtr)  mPtr->Release();                                         \
+      NS_IF_ADDREF(aCopy.mPtr);                                               \
+      NS_IF_RELEASE(mPtr);                                                    \
       mPtr = aCopy.mPtr;  return *this; }                                     \
   cls##Ptr& operator=(cls* aInterface)                                        \
     { if(mPtr == aInterface) return *this;                                    \
-      if(0 != mPtr)  mPtr->Release(); mPtr = aInterface;                      \
+      NS_IF_RELEASE(mPtr); mPtr = aInterface;                                 \
       return *this; }                                                         \
   cls##Ptr& operator=(PRInt32 aInt)                                           \
-    { if(0 != mPtr)  mPtr->Release(); mPtr = 0;                               \
+    { NS_IF_RELEASE(mPtr);                                                    \
       return *this; }                                                         \
   void  SetAddRef(cls* aInterface)                                            \
     { if(aInterface == mPtr)  return;                                         \
-      if(0 != aInterface)  aInterface->AddRef();                              \
-      if(0 != mPtr)  mPtr->Release(); mPtr = aInterface;  }                   \
-  cls*  AddRef(void)  { mPtr->AddRef(); return mPtr;  }                       \
+      NS_IF_ADDREF(aInterface);                                               \
+      NS_IF_RELEASE(mPtr); mPtr = aInterface;  }                              \
+  cls*  AddRef(void)  { NS_ADDREF(mPtr); return mPtr;  }                      \
   cls*  IfAddRef(void)                                                        \
-    { if(0 != mPtr) mPtr->AddRef(); return mPtr;  }                           \
+    { NS_IF_ADDREF(mPtr); return mPtr;  }                                     \
   cls*& AssignRef(void)                                                       \
-    { if(0 != mPtr) mPtr->Release(); mPtr = 0;  return mPtr; }                \
+    { NS_IF_RELEASE(mPtr);  return mPtr; }                                    \
   cls** AssignPtr(void)                                                       \
-    { if(0 != mPtr) mPtr->Release(); mPtr = 0;  return &mPtr; }               \
+    { NS_IF_RELEASE(mPtr);  return &mPtr; }                                   \
   void** Query(void)                                                          \
-    { if(0 != mPtr) mPtr->Release(); mPtr = 0;  return (void**)&mPtr; }       \
+    { NS_IF_RELEASE(mPtr);  return (void**)&mPtr; }                           \
   PRBool  IsNull() const                                                      \
     { return PRBool(0 == mPtr); }                                             \
   PRBool  IsNotNull() const                                                   \