From: Oliver O. <fr...@us...> - 2007-03-06 05:57:37
|
Update of /cvsroot/simspark/simspark/spark/zeitgeist In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14904 Modified Files: Tag: WIN32 core.cpp Log Message: - fixed Core::BindClass to attach a core to ClassClass Index: core.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/core.cpp,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** core.cpp 18 Feb 2007 12:01:55 -0000 1.2.2.4 --- core.cpp 6 Mar 2007 05:57:28 -0000 1.2.2.5 *************** *** 478,486 **** void Core::BindClass(const boost::shared_ptr<Class> &newClass) const { ! if (newClass != mClassClass) ! { ! newClass->Construct(newClass, mClassClass); ! newClass->AttachTo(mSelf); ! } } --- 478,490 ---- void Core::BindClass(const boost::shared_ptr<Class> &newClass) const { ! /* The following condition (true || ...) is always true. ! * The condition right of the || was the original condition, but I had to ! * change it since this caused ClassClass to have no core attached on my system ! * (which in turn made the program crash) -- oliver */ ! if (true || newClass != mClassClass) ! { ! newClass->Construct(newClass, mClassClass); ! newClass->AttachTo(mSelf); ! } } |