You can have instance_real_class_bsa be non-NULL, but still the class not

Fri Sep 26 17:24:53 2003  Owen Taylor  <otaylor@redhat.com>

        * gtype.c (g_type_instance_get_private): You can
        have instance_real_class_bsa be non-NULL, but still
        the class not be in the bsa. (Found by Kris Rietveld)
This commit is contained in:
Owen Taylor 2003-09-26 21:26:42 +00:00 committed by Owen Taylor
parent c4105a06e6
commit 61d764c54e
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,9 @@
Fri Sep 26 17:24:53 2003 Owen Taylor <otaylor@redhat.com>
* gtype.c (g_type_instance_get_private): You can
have instance_real_class_bsa be non-NULL, but still
the class not be in the bsa. (Found by Kris Rietveld)
2003-09-15 Matthias Clasen <maclas@gmx.de>
* glib-genmarshal.c (complete_out_arg): Don't generate code

View File

@ -3401,7 +3401,11 @@ g_type_instance_get_private (GTypeInstance *instance,
* so figure the instances real class first
*/
if (instance_real_class_bsa)
class = instance_real_class_get (instance);
{
class = instance_real_class_get (instance);
if (!class)
class = instance->g_class;
}
else
class = instance->g_class;