luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gparam.h gvalue.h gparam.c Shut up Sun's picky compiler.

Browse Source 
2000-07-19  Tor Lillqvist  <tml@iki.fi>

* gparam.h
* gvalue.h
* gparam.c
* gtype.c: Shut up Sun's picky compiler.
This commit is contained in:
Tor Lillqvist 2000-07-19 16:02:43 +00:00 committed by Tor Lillqvist
parent cb931f4980
commit 5e4c5611ab
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gobject/ChangeLog
View File

@ -1,3 +1,10 @@
2000-07-19 Tor Lillqvist <tml@iki.fi>
* gparam.h
* gvalue.h
* gparam.c
* gtype.c: Shut up Sun's picky compiler.
2000-07-14 Tor Lillqvist <tml@iki.fi> 2000-07-14 Tor Lillqvist <tml@iki.fi>
* gobject.def: Add g_type_get_plugin. * gobject.def: Add g_type_get_plugin.

6
gobject/gparam.c
View File

@ -185,7 +185,7 @@ g_param_spec_set_qdata_full (GParamSpec *pspec,
g_return_if_fail (G_IS_PARAM_SPEC (pspec)); g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_return_if_fail (quark > 0); g_return_if_fail (quark > 0);
g_datalist_id_set_data_full (&pspec->qdata, quark, data, data ? destroy : NULL); g_datalist_id_set_data_full (&pspec->qdata, quark, data, data ? destroy : (GDestroyNotify) NULL);
} }
gpointer gpointer
@ -331,10 +331,10 @@ g_param_spec_hash_table_remove (GHashTable *hash_table,
g_return_if_fail (hash_table != NULL); g_return_if_fail (hash_table != NULL);
g_return_if_fail (G_IS_PARAM_SPEC (pspec)); g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) != NULL); // FIXME: paranoid g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) != NULL); /* FIXME: paranoid */
g_hash_table_remove (hash_table, pspec); g_hash_table_remove (hash_table, pspec);
g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) == NULL); // FIXME: paranoid g_assert (g_param_spec_hash_table_lookup (hash_table, pspec->name, pspec->owner_type, FALSE, NULL) == NULL); /* FIXME: paranoid */
pspec->owner_type = 0; pspec->owner_type = 0;
} }

2
gobject/gparam.h
View File

@ -37,7 +37,7 @@ extern "C" {
#define G_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec)) #define G_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), G_TYPE_PARAM, GParamSpec))
#define G_IS_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM)) #define G_IS_PARAM_SPEC(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), G_TYPE_PARAM))
#define G_PARAM_SPEC_GET_CLASS(pspec) (G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass)) #define G_PARAM_SPEC_GET_CLASS(pspec) (G_TYPE_INSTANCE_GET_CLASS ((pspec), G_TYPE_PARAM, GParamSpecClass))
#define G_IS_PARAM_VALUE(pspec, value) (g_type_is_a (G_VALUE_TYPE (value), G_PARAM_SPEC_VALUE_TYPE (pspec))) // FIXME #define G_IS_PARAM_VALUE(pspec, value) (g_type_is_a (G_VALUE_TYPE (value), G_PARAM_SPEC_VALUE_TYPE (pspec))) /* FIXME */
#define G_PARAM_SPEC_VALUE_TYPE(pspec) (G_PARAM_SPEC_GET_CLASS (pspec)->value_type) #define G_PARAM_SPEC_VALUE_TYPE(pspec) (G_PARAM_SPEC_GET_CLASS (pspec)->value_type)

4
gobject/gtype.c
View File

@ -778,7 +778,7 @@ type_data_make (TypeNode *node,
*vtable = *value_table; *vtable = *value_table;
node->data->common.value_table = vtable; node->data->common.value_table = vtable;
g_assert (node->data->common.value_table != NULL); // FIXME: paranoid g_assert (node->data->common.value_table != NULL); /* FIXME: paranoid */
} }
static inline void static inline void
@ -1983,7 +1983,7 @@ g_type_init (void)
memset (&info, 0, sizeof (info)); memset (&info, 0, sizeof (info));
node = type_node_fundamental_new (G_TYPE_INTERFACE, "GInterface", G_TYPE_FLAG_DERIVABLE); node = type_node_fundamental_new (G_TYPE_INTERFACE, "GInterface", G_TYPE_FLAG_DERIVABLE);
type = NODE_TYPE (node); type = NODE_TYPE (node);
type_data_make (node, &info, NULL); // FIXME type_data_make (node, &info, NULL); /* FIXME */
g_assert (type == G_TYPE_INTERFACE); g_assert (type == G_TYPE_INTERFACE);
/* G_TYPE_* value types /* G_TYPE_* value types

2
gobject/gvalue.h
View File

@ -31,7 +31,7 @@ extern "C" {
/* --- type macros --- */ /* --- type macros --- */
#define G_TYPE_IS_VALUE(type) (g_type_value_table_peek (type) != NULL) #define G_TYPE_IS_VALUE(type) (g_type_value_table_peek (type) != NULL)
#define G_IS_VALUE(value) (G_TYPE_IS_VALUE (G_VALUE_TYPE (value))) // FIXME #define G_IS_VALUE(value) (G_TYPE_IS_VALUE (G_VALUE_TYPE (value))) /* FIXME */
#define G_VALUE_TYPE(value) (G_TYPE_FROM_CLASS (value)) #define G_VALUE_TYPE(value) (G_TYPE_FROM_CLASS (value))
#define G_VALUE_TYPE_NAME(value) (g_type_name (G_VALUE_TYPE (value))) #define G_VALUE_TYPE_NAME(value) (g_type_name (G_VALUE_TYPE (value)))