Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getting ready to build

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@41944 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%netscape.com
1999-08-03 04:59:47 +00:00
parent 51272644ed
commit 9f1efce3fd
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/xpcom/base/nsWeakReference.cpp
View File

@@ -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;
}

10
mozilla/xpcom/base/nsWeakReference.h
View File

@@ -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:

19
mozilla/xpcom/glue/nsWeakReference.cpp
View File

@@ -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;
}

10
mozilla/xpcom/glue/nsWeakReference.h
View File

@@ -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: