From 2450f31ef541772613459733c66eab37d93a73e8 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 27 Feb 2018 15:06:12 +0100 Subject: [PATCH] interrogate: remove deprecated and unneeded downcastTo*() functions They have not been needed for a very long time, and they create an awkward reverse dependency of base classes on derived classes. --- dtool/src/interrogate/interfaceMakerPythonNative.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index 3a861a4844..96420ef663 100644 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -3500,6 +3500,10 @@ write_function_for_name(ostream &out, Object *obj, out << " */\n"; + if (has_this && obj == nullptr) { + assert(obj != nullptr); + } + out << function_name << " {\n"; if (has_this) { @@ -7007,7 +7011,7 @@ record_object(TypeIndex type_index) { object->_methods.push_back(function); } } - if (itype.derivation_has_downcast(di)) { + /*if (itype.derivation_has_downcast(di)) { // Downcasts are methods of the base class, not the child class. TypeIndex base_type_index = itype.get_derivation(di); @@ -7020,7 +7024,7 @@ record_object(TypeIndex type_index) { pobject->_methods.push_back(function); } } - } + }*/ } }