From 62d4437e2d0df7a0706b564519e8fb26303f1e9a Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Fri, 17 Dec 2010 11:00:24 -0300 Subject: Fixed code generation for virtual method ownership release of returned value. The value returned from Python to C++ shouldn't have its reference counting decremented after Python transferring ownership to C++. --- generator/cppgenerator.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'generator/cppgenerator.cpp') diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index 8158fe156..f1e900f36 100644 --- a/generator/cppgenerator.cpp +++ b/generator/cppgenerator.cpp @@ -794,13 +794,11 @@ void CppGenerator::writeVirtualMethodNative(QTextStream &s, const AbstractMetaFu s << (argMod.index - 1) << "));" << endl; } else if (argMod.ownerships.contains(TypeSystem::NativeCode)) { if (argMod.index == 0 && argMod.ownerships[TypeSystem::NativeCode] == TypeSystem::CppOwnership) { - s << INDENT << "if (Shiboken::Object::checkType(" PYTHON_RETURN_VAR ")) {" << endl; + s << INDENT << "if (Shiboken::Object::checkType(" PYTHON_RETURN_VAR "))" << endl; { Indentation indent(INDENT); s << INDENT << "Shiboken::Object::releaseOwnership(" PYTHON_RETURN_VAR ");" << endl; - s << INDENT << "Py_DECREF((PyObject*) " PYTHON_RETURN_VAR ");" << endl; } - s << INDENT << '}' << endl; } } } -- cgit v1.2.3