[vala/wip/limited-generics] codegen: Use default-value to pass element_size to GArray constructor
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/wip/limited-generics] codegen: Use default-value to pass element_size to GArray constructor
- Date: Mon, 11 Mar 2019 09:38:45 +0000 (UTC)
commit a03a6b2539998cc07974fca4d72f2b2dfd25d843
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Mar 10 22:51:06 2019 +0100
codegen: Use default-value to pass element_size to GArray constructor
Based on patch by Jakub Kaszycki
codegen/valaccodebasemodule.vala | 7 -------
vapi/glib-2.0.vapi | 4 ++--
2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 3acb1b460..8894c5b84 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4898,13 +4898,6 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
carg_map = out_arg_map;
}
- // g_array_new: element size
- if (cl == garray_type && param.name == "element_size") {
- var csizeof = new CCodeFunctionCall (new
CCodeIdentifier ("sizeof"));
- csizeof.add_argument (new CCodeIdentifier
(get_ccode_name (expr.type_reference.get_type_arguments ().get (0))));
- cexpr = csizeof;
- }
-
if (get_ccode_array_length (param) && param.variable_type is
ArrayType) {
var array_type = (ArrayType) param.variable_type;
for (int dim = 1; dim <= array_type.rank; dim++) {
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 44e11df64..e311915ae 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -5298,9 +5298,9 @@ namespace GLib {
[CCode (cname = "data", array_length_cname = "len", array_length_type = "uint")]
public G[] data;
- public Array (bool zero_terminated = true, bool clear = true, ulong element_size = 0);
+ public Array (bool zero_terminated = true, bool clear = true, ulong element_size = sizeof
(G));
[CCode (cname = "g_array_sized_new")]
- public Array.sized (bool zero_terminated, bool clear, ulong element_size, uint reserved_size);
+ public Array.sized (bool zero_terminated = true, bool clear = true, ulong element_size =
sizeof (G), uint reserved_size = 0);
public void append_val (owned G value);
public void append_vals (void* data, uint len);
public void prepend_val (owned G value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]