From 9f1efce3fd354eac4758fba68eba66e22697cd3d Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 Aug 1999 04:59:47 +0000
Subject: [PATCH] getting ready to build

git-svn-id: svn://10.0.0.236/trunk@41944 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpcom/base/nsWeakReference.cpp | 19 +++++++++++--------
 mozilla/xpcom/base/nsWeakReference.h   | 10 +++++-----
 mozilla/xpcom/glue/nsWeakReference.cpp | 19 +++++++++++--------
 mozilla/xpcom/glue/nsWeakReference.h   | 10 +++++-----
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/mozilla/xpcom/base/nsWeakReference.cpp b/mozilla/xpcom/base/nsWeakReference.cpp
index 31a94d932a8..448663cc7cb 100644
--- a/mozilla/xpcom/base/nsWeakReference.cpp
+++ b/mozilla/xpcom/base/nsWeakReference.cpp
@@ -5,13 +5,16 @@
 nsIWeakReference*
 NS_GetWeakReference( nsISupports* aInstance, nsresult* aResult )
 	{
-		nsIWeakReference* result = 0;
-		nsCOMPtr<nsISupportsWeakReference> factory = do_QueryInterface(aInstance, aResult);
+		nsresult status;
+		if ( !aResult )
+			aResult = &status;
 
-		nsIWeakReference* w
-		if ( factory )
-			result = factory->GetWeakReference();
-		return result;
+		nsCOMPtr<nsISupportsWeakReference> factoryP = do_QueryInterface(aInstance, aResult);
+
+		nsIWeakReference* weakP = 0;
+		if ( factoryP )
+			status = factoryP->GetWeakReference(&weakP);
+		return weakP;
 	}
 
 nsresult
@@ -39,7 +42,7 @@ nsSupportsWeakReference::GetWeakReference( nsIWeakReference** aInstancePtr )
 nsrefcnt
 nsWeakReference::AddRef()
 	{
-		return ++mRefCount
+		return ++mRefCount;
 	}
 
 nsrefcnt
@@ -79,5 +82,5 @@ nsWeakReference::QueryInterface( const nsIID& aIID, void** aInstancePtr )
 nsresult
 nsWeakReference::QueryReference( const nsIID& aIID, void** aInstancePtr )
 	{
-		return mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_PTR;
+		return mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_POINTER;
 	}
diff --git a/mozilla/xpcom/base/nsWeakReference.h b/mozilla/xpcom/base/nsWeakReference.h
index d8ea97c07fa..0d9e2a3a3ac 100644
--- a/mozilla/xpcom/base/nsWeakReference.h
+++ b/mozilla/xpcom/base/nsWeakReference.h
@@ -16,7 +16,7 @@ class nsSupportsWeakReference : public nsISupportsWeakReference
 
 			inline ~nsSupportsWeakReference();
 
-			virtual nsresult GetWeakReference( nsIWeakReference** );
+			NS_IMETHOD GetWeakReference( nsIWeakReference** );
 
 		private:
 			friend class nsWeakReference;
@@ -35,12 +35,12 @@ class nsWeakReference : public nsIWeakReference
 	{
 		public:
 		// nsISupports...
-			virtual nsrefcnt AddRef();
-			virtual nsrefcnt Release();
-			virtual nsresult QueryInterface( const nsIID&, void** );
+			NS_IMETHOD_(nsrefcnt) AddRef();
+			NS_IMETHOD_(nsrefcnt) Release();
+			NS_IMETHOD QueryInterface( const nsIID&, void** );
 
 		// nsIWeakReference...
-			virtual nsresult QueryReference( const nsIID&, void** );
+			NS_IMETHOD QueryReference( const nsIID&, void** );
 
 
 		private:
diff --git a/mozilla/xpcom/glue/nsWeakReference.cpp b/mozilla/xpcom/glue/nsWeakReference.cpp
index 31a94d932a8..448663cc7cb 100644
--- a/mozilla/xpcom/glue/nsWeakReference.cpp
+++ b/mozilla/xpcom/glue/nsWeakReference.cpp
@@ -5,13 +5,16 @@
 nsIWeakReference*
 NS_GetWeakReference( nsISupports* aInstance, nsresult* aResult )
 	{
-		nsIWeakReference* result = 0;
-		nsCOMPtr<nsISupportsWeakReference> factory = do_QueryInterface(aInstance, aResult);
+		nsresult status;
+		if ( !aResult )
+			aResult = &status;
 
-		nsIWeakReference* w
-		if ( factory )
-			result = factory->GetWeakReference();
-		return result;
+		nsCOMPtr<nsISupportsWeakReference> factoryP = do_QueryInterface(aInstance, aResult);
+
+		nsIWeakReference* weakP = 0;
+		if ( factoryP )
+			status = factoryP->GetWeakReference(&weakP);
+		return weakP;
 	}
 
 nsresult
@@ -39,7 +42,7 @@ nsSupportsWeakReference::GetWeakReference( nsIWeakReference** aInstancePtr )
 nsrefcnt
 nsWeakReference::AddRef()
 	{
-		return ++mRefCount
+		return ++mRefCount;
 	}
 
 nsrefcnt
@@ -79,5 +82,5 @@ nsWeakReference::QueryInterface( const nsIID& aIID, void** aInstancePtr )
 nsresult
 nsWeakReference::QueryReference( const nsIID& aIID, void** aInstancePtr )
 	{
-		return mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_PTR;
+		return mReferent ? mReferent->QueryInterface(aIID, aInstancePtr) : NS_ERROR_NULL_POINTER;
 	}
diff --git a/mozilla/xpcom/glue/nsWeakReference.h b/mozilla/xpcom/glue/nsWeakReference.h
index d8ea97c07fa..0d9e2a3a3ac 100644
--- a/mozilla/xpcom/glue/nsWeakReference.h
+++ b/mozilla/xpcom/glue/nsWeakReference.h
@@ -16,7 +16,7 @@ class nsSupportsWeakReference : public nsISupportsWeakReference
 
 			inline ~nsSupportsWeakReference();
 
-			virtual nsresult GetWeakReference( nsIWeakReference** );
+			NS_IMETHOD GetWeakReference( nsIWeakReference** );
 
 		private:
 			friend class nsWeakReference;
@@ -35,12 +35,12 @@ class nsWeakReference : public nsIWeakReference
 	{
 		public:
 		// nsISupports...
-			virtual nsrefcnt AddRef();
-			virtual nsrefcnt Release();
-			virtual nsresult QueryInterface( const nsIID&, void** );
+			NS_IMETHOD_(nsrefcnt) AddRef();
+			NS_IMETHOD_(nsrefcnt) Release();
+			NS_IMETHOD QueryInterface( const nsIID&, void** );
 
 		// nsIWeakReference...
-			virtual nsresult QueryReference( const nsIID&, void** );
+			NS_IMETHOD QueryReference( const nsIID&, void** );
 
 
 		private: