diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-17 19:57:49 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-17 21:04:11 +0200 |
| commit | 40732437777d00598fe9fcd35a2a9bf22eeb8f8a (patch) | |
| tree | 93c8558d1ad4a00ab2fa127db0f872b9540242cb /codegen/valagsignalmodule.vala | |
| parent | 1ac0e9d3b5891f258823cd6dc7db742eede85028 (diff) | |
| download | vala-40732437777d00598fe9fcd35a2a9bf22eeb8f8a.tar.gz | |
codegen: Nullable ValueType requires POINTER as marshaller signature
This is missing in https://bugzilla.gnome.org/show_bug.cgi?id=758816
https://bugzilla.gnome.org/show_bug.cgi?id=783897
Diffstat (limited to 'codegen/valagsignalmodule.vala')
| -rw-r--r-- | codegen/valagsignalmodule.vala | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala index 1c0eff476..306c374cd 100644 --- a/codegen/valagsignalmodule.vala +++ b/codegen/valagsignalmodule.vala @@ -36,11 +36,7 @@ public class Vala.GSignalModule : GObjectModule { } } - if (return_type is ValueType && return_type.nullable) { - ret = "%s_POINTER_".printf (prefix); - } else { - ret = "%s_%s_".printf (prefix, get_ccode_marshaller_type_name (return_type)); - } + ret = "%s_%s_".printf (prefix, get_ccode_marshaller_type_name (return_type)); if (params == null || params.size == 0) { ret = ret + "_VOID"; @@ -93,11 +89,7 @@ public class Vala.GSignalModule : GObjectModule { private string get_marshaller_signature (List<Parameter> params, DataType return_type) { string signature; - if (return_type is ValueType && return_type.nullable) { - signature = "POINTER:"; - } else { - signature = "%s:".printf (get_ccode_marshaller_type_name (return_type)); - } + signature = "%s:".printf (get_ccode_marshaller_type_name (return_type)); if (params == null || params.size == 0) { signature = signature + "VOID"; } else { |