From 3a109829a859ba578dd7b18a25c91eaeddd57579 Mon Sep 17 00:00:00 2001 From: Dom Lachowicz Date: Thu, 12 Sep 2002 04:03:54 +0000 Subject: [PATCH] Fix problems with excessive C++ warnings: "ISO C++ forbids nested groups Wed Sep 11 16:50:20 2002 Dom Lachowicz * gtype.h: Fix problems with excessive C++ warnings: "ISO C++ forbids nested groups within expressions" --- gobject/ChangeLog | 4 ++++ gobject/gtype.h | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index f854af5..38380b6 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 11 16:50:20 2002 Dom Lachowicz + + * gtype.h: Fix problems with excessive C++ warnings: "ISO C++ forbids nested groups within expressions" + Fri Jul 26 15:46:36 2002 Owen Taylor * gvaluetransform.c: Fix problems with excess ';' diff --git a/gobject/gtype.h b/gobject/gtype.h index c3d2357..9c9ea09 100644 --- a/gobject/gtype.h +++ b/gobject/gtype.h @@ -352,22 +352,22 @@ G_CONST_RETURN gchar* g_type_name_from_class (GTypeClass *g_class); #define _G_TYPE_IGC(ip, gt, ct) ((ct*) (((GTypeInstance*) ip)->g_class)) #define _G_TYPE_IGI(ip, gt, ct) ((ct*) g_type_interface_peek (((GTypeInstance*) ip)->g_class, gt)) #ifdef __GNUC__ -# define _G_TYPE_CIT(ip, gt) ({ \ +# define _G_TYPE_CIT(ip, gt) (G_GNUC_EXTENSION ({ \ GTypeInstance *__inst = (GTypeInstance*) ip; GType __t = gt; gboolean __r; \ if (__inst && __inst->g_class && __inst->g_class->g_type == __t) \ __r = TRUE; \ else \ __r = g_type_check_instance_is_a (__inst, __t); \ __r; \ -}) -# define _G_TYPE_CCT(cp, gt) ({ \ +})) +# define _G_TYPE_CCT(cp, gt) (G_GNUC_EXTENSION ({ \ GTypeClass *__class = (GTypeClass*) cp; GType __t = gt; gboolean __r; \ if (__class && __class->g_type == __t) \ __r = TRUE; \ else \ __r = g_type_check_class_is_a (__class, __t); \ __r; \ -}) +})) #else /* !__GNUC__ */ # define _G_TYPE_CIT(ip, gt) (g_type_check_instance_is_a ((GTypeInstance*) ip, gt)) # define _G_TYPE_CCT(cp, gt) (g_type_check_class_is_a ((GTypeClass*) cp, gt)) -- 2.7.4