From 3aee3f63c4614caf640a9805ce28796bba617023 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Sun, 23 Feb 2014 17:24:11 +0000 Subject: [PATCH] cogl-gtype: add missing gtype macros in intermediate macros Reviewed-by: Neil Roberts --- cogl/cogl-buffer-private.h | 2 +- cogl/cogl-framebuffer.c | 6 +++--- cogl/cogl-object-private.h | 4 +--- cogl/cogl-onscreen.c | 6 +++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cogl/cogl-buffer-private.h b/cogl/cogl-buffer-private.h index 0402abb9c..eab81fda4 100644 --- a/cogl/cogl-buffer-private.h +++ b/cogl/cogl-buffer-private.h @@ -119,7 +119,7 @@ void _cogl_buffer_register_buffer_type (const CoglObjectClass *klass); #define COGL_BUFFER_DEFINE(TypeName, type_name) \ - COGL_OBJECT_DEFINE_WITH_CODE_GTYPE \ + COGL_OBJECT_DEFINE_WITH_CODE \ (TypeName, type_name, \ _cogl_buffer_register_buffer_type (&_cogl_##type_name##_class)) diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c index 3245d61eb..135b873eb 100644 --- a/cogl/cogl-framebuffer.c +++ b/cogl/cogl-framebuffer.c @@ -65,9 +65,9 @@ static CoglUserDataKey wire_pipeline_key; static void _cogl_offscreen_free (CoglOffscreen *offscreen); -COGL_OBJECT_DEFINE_WITH_CODE (Offscreen, offscreen, - _cogl_offscreen_class.virt_unref = - _cogl_framebuffer_unref); +COGL_OBJECT_DEFINE_WITH_CODE_GTYPE (Offscreen, offscreen, + _cogl_offscreen_class.virt_unref = + _cogl_framebuffer_unref); COGL_GTYPE_DEFINE_CLASS (Offscreen, offscreen); COGL_OBJECT_DEFINE_DEPRECATED_REF_COUNTING (offscreen); COGL_GTYPE_DEFINE_INTERFACE (Framebuffer, framebuffer); diff --git a/cogl/cogl-object-private.h b/cogl/cogl-object-private.h index 61ada8f3a..7955a35cc 100644 --- a/cogl/cogl-object-private.h +++ b/cogl/cogl-object-private.h @@ -221,9 +221,7 @@ cogl_is_##type_name (void *object) \ #define COGL_OBJECT_DEFINE_WITH_CODE(TypeName, type_name, code) \ \ -COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, \ - type_name, \ - do { code; } while (0);) \ +COGL_OBJECT_COMMON_DEFINE_WITH_CODE(TypeName, type_name, code) \ \ CoglBool \ cogl_is_##type_name (void *object) \ diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c index 8ca97709e..a7a958f29 100644 --- a/cogl/cogl-onscreen.c +++ b/cogl/cogl-onscreen.c @@ -46,9 +46,9 @@ static void _cogl_onscreen_free (CoglOnscreen *onscreen); -COGL_OBJECT_DEFINE_WITH_CODE (Onscreen, onscreen, - _cogl_onscreen_class.virt_unref = - _cogl_framebuffer_unref); +COGL_OBJECT_DEFINE_WITH_CODE_GTYPE (Onscreen, onscreen, + _cogl_onscreen_class.virt_unref = + _cogl_framebuffer_unref); COGL_GTYPE_DEFINE_CLASS (Onscreen, onscreen, COGL_GTYPE_IMPLEMENT_INTERFACE (framebuffer));