CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 07/12/17 07:41:43
Modified files:
. : ChangeLog
server : character.cpp
Log message:
* server/character.cpp: remove the assertion in charcter::destroy(),
it's not
correct as tests confirmed.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5188&r2=1.5189
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.68&r2=1.69
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5188
retrieving revision 1.5189
diff -u -b -r1.5188 -r1.5189
--- ChangeLog 17 Dec 2007 07:33:25 -0000 1.5188
+++ ChangeLog 17 Dec 2007 07:41:42 -0000 1.5189
@@ -3,6 +3,8 @@
* testsuite/misc-ming.all/new_child_in_unload_test.c, Makefile.am:
new test for inspecting ::destroy(). We may want to destroy an
character
that is not unloaded.
+ * server/character.cpp: remove the assertion in charcter::destroy(),
it's not
+ correct as tests confirmed.
2007-12-16 Sandro Santilli <[EMAIL PROTECTED]>
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/character.cpp 14 Dec 2007 20:51:20 -0000 1.68
+++ server/character.cpp 17 Dec 2007 07:41:42 -0000 1.69
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: character.cpp,v 1.68 2007/12/14 20:51:20 strk Exp $ */
+/* $Id: character.cpp,v 1.69 2007/12/17 07:41:42 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -833,13 +833,11 @@
void
character::destroy()
{
- /// We can't be destroyed w/out being unloaded first, right ?
- /// we may change this in the future...
- assert(isUnloaded());
+ /// we may destory a character that's not unloaded.
+ ///(we don't have chance to unload it in current model, see
new_child_in_unload_test.c)
/// We don't destroy ourself twice, right ?
assert(!_destroyed);
-
_destroyed = true;
}
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
