From eaedfa68dc5fe5b32c55694065875162995ef29b Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 28 Mar 2015 20:51:45 +0100 Subject: [PATCH] Fix regression: methods returning const char pointer were ignored. --- dtool/src/interrogate/interfaceMakerPythonNative.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx index 0242377280..4b2148a74a 100644 --- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx +++ b/dtool/src/interrogate/interfaceMakerPythonNative.cxx @@ -6415,8 +6415,9 @@ is_remap_legal(FunctionRemap *remap) { } // We don't currently support returning pointers, but we accept - // them as function parameters. - if (TypeManager::is_pointer_to_simple(remap->_return_type->get_orig_type())) { + // them as function parameters. But const char * is an exception. + if (!remap->_return_type->new_type_is_atomic_string() && + TypeManager::is_pointer_to_simple(remap->_return_type->get_orig_type())) { return false; }