TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix interrogate bug with detecting parameter coercion possibility

Browse Source
This commit is contained in:
rdb 2015-03-25 19:37:00 +01:00
parent 3371df8403
commit c9f8ccf901
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4244,6 +4244,10 @@ write_function_forset(ostream &out,
for (sii = remaps.begin(); sii != remaps.end(); sii ++) {
remap = (*sii);
if (!is_remap_coercion_possible(remap)) {
indent(out, indent_level)
<< "// No coercion possible: ";
remap->write_orig_prototype(out, 0, false, (max_num_args - min_num_args));
out << "\n";
continue;
}
@ -5143,14 +5147,8 @@ write_function_instance(ostream &out, FunctionRemap *remap,
method_prefix = classNameFromCppName(this_class_name, false) + string(".");
}
if (coercion_possible) {
if (has_coerce_constructor(obj_type->as_struct_type()) == 0) {
// Doesn't actually have a coerce constructor.
coercion_possible = false;
}
}
if (coercion_possible) {
if (coercion_possible &&
has_coerce_constructor(obj_type->as_struct_type())) {
// Call the coercion function directly, which will try to
// extract the pointer directly before trying coercion.
string coerce_call;
@ -6527,7 +6525,6 @@ is_remap_coercion_possible(FunctionRemap *remap) {
// It has a coercion constructor, so go for it.
return true;
}
break;
}
++pn;
}