backout most recent mork changes to fix build bustage

git-svn-id: svn://10.0.0.236/trunk@114719 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%netscape.com 2002-02-17 03:11:14 +00:00
parent 9f5f9240e6
commit 643d24f7a1
5 changed files with 17 additions and 2 deletions

View File

@ -393,8 +393,10 @@ public:
mdb_count* outCount) = 0;
NS_IMETHOD AddWeakRef(nsIMdbEnv* ev) = 0;
NS_IMETHOD AddStrongRef(nsIMdbEnv* ev) = 0;
NS_IMETHOD CutWeakRef(nsIMdbEnv* ev) = 0;
NS_IMETHOD CutStrongRef(nsIMdbEnv* ev) = 0;
NS_IMETHOD CloseMdbObject(nsIMdbEnv* ev) = 0; // called at strong refs zero
NS_IMETHOD IsOpenMdbObject(nsIMdbEnv* ev, mdb_bool* outOpen) = 0;

View File

@ -556,7 +556,7 @@ morkStdioFile::AcquireBud(nsIMdbEnv * mdbev, nsIMdbHeap* ioHeap, nsIMdbFile **ac
//#endif /*MORK_WIN*/
if ( ev->Good() && this->AddStrongRef(ev))
if ( ev->Good() && this->AddStrongRef(ev->AsMdbEnv()) )
{
outFile = this;
AddRef();

View File

@ -180,12 +180,23 @@ morkObject::AddWeakRef(nsIMdbEnv* mev)
{
return morkNode::AddWeakRef((morkEnv *) mev);
}
NS_IMETHODIMP
morkObject::AddStrongRef(nsIMdbEnv* mev)
{
return morkNode::AddStrongRef((morkEnv *) mev);
}
NS_IMETHODIMP
morkObject::CutWeakRef(nsIMdbEnv* mev)
{
return morkNode::CutWeakRef((morkEnv *) mev);
}
NS_IMETHODIMP
morkObject::CutStrongRef(nsIMdbEnv* mev)
{
return morkNode::CutStrongRef((morkEnv *) mev);
}
NS_IMETHODIMP
morkObject::CloseMdbObject(nsIMdbEnv* mev)

View File

@ -123,8 +123,10 @@ public: // morkNode virtual methods
mdb_count* outCount);
NS_IMETHOD AddWeakRef(nsIMdbEnv* ev);
NS_IMETHOD AddStrongRef(nsIMdbEnv* ev);
NS_IMETHOD CutWeakRef(nsIMdbEnv* ev);
NS_IMETHOD CutStrongRef(nsIMdbEnv* ev);
NS_IMETHOD CloseMdbObject(nsIMdbEnv* ev); // called at strong refs zero
NS_IMETHOD IsOpenMdbObject(nsIMdbEnv* ev, mdb_bool* outOpen);

View File

@ -269,7 +269,7 @@ morkWriter::MakeWriterStream(morkEnv* ev) // give writer a suitable stream
if ( ev->Good() )
mWriter_Stream = stream;
else
stream->CutStrongRef(ev);
stream->CutStrongRef(ev->AsMdbEnv());
}
}
else