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

Some compilers insist that AddRef and Release return |nsrefcnt| in order to get along with nsDerivedSafe. Hopefully fixing gcc 2.95 bustage.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@138147 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2003-02-22 03:57:32 +00:00
parent 7cfde91627
commit 5eef234bb4
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/xpcom/tests/TestAutoPtr.cpp
View File

@@ -55,15 +55,16 @@ class TestObject : public TestObjectBaseA, public TestObjectBaseB {
class TestRefObjectBaseA {
public:
int fooA;
virtual void AddRef() = 0;
virtual void Release() = 0;
// Must return |nsrefcnt| to keep |nsDerivedSafe| happy.
virtual nsrefcnt AddRef() = 0;
virtual nsrefcnt Release() = 0;
};
class TestRefObjectBaseB {
public:
int fooB;
virtual void AddRef() = 0;
virtual void Release() = 0;
virtual nsrefcnt AddRef() = 0;
virtual nsrefcnt Release() = 0;
};
class TestRefObject : public TestRefObjectBaseA, public TestRefObjectBaseB {
@@ -81,20 +82,24 @@ class TestRefObject : public TestRefObjectBaseA, public TestRefObjectBaseB {
NS_STATIC_CAST(void*, this));
}
void AddRef()
nsrefcnt AddRef()
{
++mRefCount;
printf(" AddRef to %d on TestRefObject %p.\n",
mRefCount, NS_STATIC_CAST(void*, this));
return mRefCount;
}
void Release()
nsrefcnt Release()
{
--mRefCount;
printf(" Release to %d on TestRefObject %p.\n",
mRefCount, NS_STATIC_CAST(void*, this));
if (mRefCount == 0)
if (mRefCount == 0) {
delete NS_CONST_CAST(TestRefObject*, this);
return 0;
}
return mRefCount;
}
protected: