Fixes writeReturnValueHeuristics to not mess with constructors.

Also fixes isWrapperType to avoid erring when the type is an object type passed as value. Reviewed by Hugo Parente <[email protected]> Reviewed by Luciano Wolf <[email protected]>
pcacjr · Oct 17, 2011 · db044d2 · db044d2
1 parent 5ee637f
commit db044d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
@@ -4187,6 +4187,7 @@ void CppGenerator::writeReturnValueHeuristics(QTextStream& s, const AbstractMeta
         || !func->ownerClass()
         || !type
         || func->isStatic()
+        || func->isConstructor()
         || !func->typeReplaced(0).isEmpty()) {
         return;
     }

diff --git a/generator/shibokengenerator.cpp b/generator/shibokengenerator.cpp
@@ -864,7 +864,7 @@ bool ShibokenGenerator::isWrapperType(const AbstractMetaType* metaType)
 
 bool ShibokenGenerator::isPointerToWrapperType(const AbstractMetaType* type)
 {
-    return isObjectType(type) || type->isValuePointer();
+    return (isObjectType(type) && type->indirections() == 1) || type->isValuePointer();
 }
 
 bool ShibokenGenerator::shouldDereferenceArgumentPointer(const AbstractMetaArgument* arg)