luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename the generated private data getter function

Browse Source 
As it turns out, we have examples of internal functions called
type_name_get_private() in the wild (especially among older libraries),
so we need to use a name for the per-instance private data getter
function that hopefully won't conflict with anything.
This commit is contained in:
Emmanuele Bassi
2013-06-24 15:43:04 +01:00
parent 6000bc9ea8
commit 54cc43630d
79 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/gtype.h
View File

@@ -1556,7 +1556,7 @@ guint g_type_get_type_registration_serial (void);
* gint
* my_object_get_foo (MyObject *obj)
* {
* MyObjectPrivate *priv = my_object_get_private (obj);
* MyObjectPrivate *priv = my_object_get_instance_private (obj);
*
* return priv->foo;
* }
@@ -1565,7 +1565,7 @@ guint g_type_get_type_registration_serial (void);
* my_object_set_bar (MyObject *obj,
* gint bar)
* {
* MyObjectPrivate *priv = my_object_get_private (obj);
* MyObjectPrivate *priv = my_object_get_instance_private (obj);
*
* if (priv->bar != bar)
* priv->bar = bar;
@@ -1651,7 +1651,7 @@ static void type_name##_class_intern_init (gpointer klass) \
} \
\
static inline gpointer \
type_name##_get_private (TypeName *self) \
type_name##_get_instance_private (TypeName *self) \
{ \
return (G_STRUCT_MEMBER_P (self, TypeName##_private_offset)); \
} \

16
gobject/tests/private.c
View File

@@ -26,7 +26,7 @@ test_object_class_init (TestObjectClass *klass)
static void
test_object_init (TestObject *self)
{
TestObjectPrivate *priv = test_object_get_private (self);
TestObjectPrivate *priv = test_object_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
@@ -41,7 +41,7 @@ test_object_init (TestObject *self)
static int
test_object_get_dummy_0 (TestObject *self)
{
TestObjectPrivate *priv = test_object_get_private (self);
TestObjectPrivate *priv = test_object_get_instance_private (self);
return priv->dummy_0;
}
@@ -49,7 +49,7 @@ test_object_get_dummy_0 (TestObject *self)
static float
test_object_get_dummy_1 (TestObject *self)
{
TestObjectPrivate *priv = test_object_get_private (self);
TestObjectPrivate *priv = test_object_get_instance_private (self);
return priv->dummy_1;
}
@@ -74,7 +74,7 @@ G_DEFINE_TYPE_WITH_CODE (TestDerived, test_derived, test_object_get_type (),
static void
test_derived_finalize (GObject *obj)
{
TestDerivedPrivate *priv = test_derived_get_private ((TestDerived *) obj);
TestDerivedPrivate *priv = test_derived_get_instance_private ((TestDerived *) obj);
g_free (priv->dummy_2);
@@ -90,7 +90,7 @@ test_derived_class_init (TestDerivedClass *klass)
static void
test_derived_init (TestDerived *self)
{
TestDerivedPrivate *priv = test_derived_get_private (self);
TestDerivedPrivate *priv = test_derived_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
@@ -104,7 +104,7 @@ test_derived_init (TestDerived *self)
static const char *
test_derived_get_dummy_2 (TestDerived *self)
{
TestDerivedPrivate *priv = test_derived_get_private (self);
TestDerivedPrivate *priv = test_derived_get_instance_private (self);
return priv->dummy_2;
}
@@ -178,7 +178,7 @@ test_mixed_derived_class_init (TestMixedDerivedClass *klass)
static void
test_mixed_derived_init (TestMixedDerived *self)
{
TestMixedDerivedPrivate *priv = test_mixed_derived_get_private (self);
TestMixedDerivedPrivate *priv = test_mixed_derived_get_instance_private (self);
if (g_test_verbose ())
g_print ("Offset of %sPrivate for type '%s': %d\n",
@@ -192,7 +192,7 @@ test_mixed_derived_init (TestMixedDerived *self)
static gint64
test_mixed_derived_get_dummy_4 (TestMixedDerived *self)
{
TestMixedDerivedPrivate *priv = test_mixed_derived_get_private (self);
TestMixedDerivedPrivate *priv = test_mixed_derived_get_instance_private (self);
return priv->dummy_4;
}