TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash running TaskTester

Browse Source
This commit is contained in:
rdb 2016-06-11 01:11:03 +02:00
parent 12873c0d7e
commit ba919b0948
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/src/interrogate/interfaceMaker.cxx
View File

@ -145,7 +145,8 @@ check_protocols() {
if (func->_ifunc.get_name() == "__traverse__") { if (func->_ifunc.get_name() == "__traverse__") {
// If we have a method named __traverse__, we implement Python's // If we have a method named __traverse__, we implement Python's
// cyclic garbage collection protocol. // cyclic garbage collection protocol.
_protocol_types |= PT_python_gc; //XXX disabled for now because it's too unstable.
//_protocol_types |= PT_python_gc;
} }
} }

11
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -2730,10 +2730,9 @@ write_module_class(ostream &out, Object *obj) {
} }
string gcflag; string gcflag;
// Disabled for now because it's too unstable. if (obj->_protocol_types & Object::PT_python_gc) {
/*if (obj->_protocol_types & Object::PT_python_gc) {
gcflag = " | Py_TPFLAGS_HAVE_GC"; gcflag = " | Py_TPFLAGS_HAVE_GC";
}*/ }
// long tp_flags; // long tp_flags;
if (has_local_getbuffer) { if (has_local_getbuffer) {
@ -2759,10 +2758,12 @@ write_module_class(ostream &out, Object *obj) {
} }
// traverseproc tp_traverse; // traverseproc tp_traverse;
write_function_slot(out, 4, slots, "tp_traverse"); out << " 0, // tp_traverse\n";
//write_function_slot(out, 4, slots, "tp_traverse");
// inquiry tp_clear; // inquiry tp_clear;
write_function_slot(out, 4, slots, "tp_clear"); out << " 0, // tp_clear\n";
//write_function_slot(out, 4, slots, "tp_clear");
// richcmpfunc tp_richcompare; // richcmpfunc tp_richcompare;
if (has_local_richcompare) { if (has_local_richcompare) {