codegen: Cast return values if [CCode (type)] is supplied

Patch by avi.w.levy@gmail.com

Fixes bug 699956.

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 8cb1171407f860cefe4be8c32b06d1333258eb9d..6bc87cb841a5cf9bb675c2755c2e58939e687028 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -714,6 +714,11 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                        }
                }
 
+               if (get_ccode_type (m) != null && get_ccode_type (m) != get_ccode_name (m.return_type)) {
+                       // Bug 699956: Implement cast for method return type if [CCode type=] annotation is specified
+                       ccall_expr = new CCodeCastExpression (ccall_expr, get_ccode_name (m.return_type));
+               }
+
                if (m is ArrayResizeMethod) {
                        // FIXME: size expression must not be evaluated twice at runtime (potential side effects)
                        Iterator<Expression> arg_it = expr.get_argument_list ().iterator ();