From: <ag...@us...> - 2009-09-18 23:51:15
|
Revision: 983 http://zoolib.svn.sourceforge.net/zoolib/?rev=983&view=rev Author: agreen Date: 2009-09-18 23:51:06 +0000 (Fri, 18 Sep 2009) Log Message: ----------- Make ZWeakReferee destructor protected -- only disposable through a subclass. Modified Paths: -------------- trunk/zoolib/source/cxx/zoolib/ZRefWeak.cpp trunk/zoolib/source/cxx/zoolib/ZRefWeak.h Modified: trunk/zoolib/source/cxx/zoolib/ZRefWeak.cpp =================================================================== --- trunk/zoolib/source/cxx/zoolib/ZRefWeak.cpp 2009-09-18 23:49:15 UTC (rev 982) +++ trunk/zoolib/source/cxx/zoolib/ZRefWeak.cpp 2009-09-18 23:51:06 UTC (rev 983) @@ -101,9 +101,7 @@ {} ZWeakReferee::~ZWeakReferee() - { - this->pDetachProxy(); - } + { this->pDetachProxy(); } void ZWeakReferee::pDetachProxy() { Modified: trunk/zoolib/source/cxx/zoolib/ZRefWeak.h =================================================================== --- trunk/zoolib/source/cxx/zoolib/ZRefWeak.h 2009-09-18 23:49:15 UTC (rev 982) +++ trunk/zoolib/source/cxx/zoolib/ZRefWeak.h 2009-09-18 23:51:06 UTC (rev 983) @@ -34,11 +34,10 @@ class ZWeakReferee { -public: +protected: ZWeakReferee(); ~ZWeakReferee(); -protected: void pDetachProxy(); private: @@ -91,7 +90,7 @@ ZRefWeak& operator=(const ZRefWeak& iOther) { - this->AssignFrom(iOther); + ZRefWeakBase::pAssignFrom(iOther); return *this; } @@ -107,7 +106,7 @@ ZRefWeak& operator=(const ZRefWeak<O>& iOther) { static_cast<T*>(static_cast<O*>(0)); - this->AssignFrom(iOther); + ZRefWeakBase::pAssignFrom(iOther); return *this; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |