[glib] Revert "glib-genmarshal: Treat all parameters the same"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "glib-genmarshal: Treat all parameters the same"
- Date: Thu, 1 Oct 2015 11:01:49 +0000 (UTC)
commit cc818f5fe402c9c04f2ac1277bacbfe1cebfc2fe
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Oct 1 11:54:11 2015 +0100
Revert "glib-genmarshal: Treat all parameters the same"
This reverts commit 8e362161d9554e8a6c1e82f95bff24fc9fdcf9ef.
There is a fundamental difference between g_value_peek_pointer() and
g_value_get_pointer(), and it's not just complexity: the latter checks
if the GValue holds a pointer type, whereas the former doesn't.
https://bugzilla.gnome.org/show_bug.cgi?id=755922
gobject/glib-genmarshal.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index aed0e02..ca78a6f 100644
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -441,9 +441,9 @@ generate_marshal (const gchar *signame,
g_fprintf (fout, "\n");
g_fprintf (fout, " if (G_CCLOSURE_SWAP_DATA (closure))\n {\n");
g_fprintf (fout, " data1 = closure->data;\n");
- g_fprintf (fout, " data2 = g_marshal_value_peek_pointer (param_values + 0);\n");
+ g_fprintf (fout, " data2 = g_value_peek_pointer (param_values + 0);\n");
g_fprintf (fout, " }\n else\n {\n");
- g_fprintf (fout, " data1 = g_marshal_value_peek_pointer (param_values + 0);\n");
+ g_fprintf (fout, " data1 = g_value_peek_pointer (param_values + 0);\n");
g_fprintf (fout, " data2 = closure->data;\n");
g_fprintf (fout, " }\n");
g_fprintf (fout, " callback = (GMarshalFunc_%s) (marshal_data ? marshal_data : cc->callback);\n",
signame);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]