[cogl/cogl-1.14: 41/174] object: Move cogl_object_{ref, unref}() to cogl-object.h
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.14: 41/174] object: Move cogl_object_{ref, unref}() to cogl-object.h
- Date: Tue, 22 Jan 2013 18:34:13 +0000 (UTC)
commit 0866b90069452b5f7aff8f8983ffdb4f57feb20b
Author: Damien Lespiau <damien lespiau intel com>
Date: Sun Sep 30 00:24:46 2012 +0100
object: Move cogl_object_{ref,unref}() to cogl-object.h
Reviewed-by: Robert Bragg <robert linux intel com>
(cherry picked from commit d2f07344a361c43ccdb85a0587812ca3a103078b)
cogl/cogl-object.h | 21 +++++++++++++++++++++
cogl/cogl-types.h | 21 ---------------------
2 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/cogl/cogl-object.h b/cogl/cogl-object.h
index 28fce1a..da43bb3 100644
--- a/cogl/cogl-object.h
+++ b/cogl/cogl-object.h
@@ -30,6 +30,27 @@ typedef struct _CoglObject CoglObject;
#define COGL_OBJECT(X) ((CoglObject *)X)
/**
+ * cogl_object_ref: (skip)
+ * @object: a #CoglObject
+ *
+ * Increases the reference count of @object by 1
+ *
+ * Returns: the @object, with its reference count increased
+ */
+void *
+cogl_object_ref (void *object);
+
+/**
+ * cogl_object_unref: (skip)
+ * @object: a #CoglObject
+ *
+ * Drecreases the reference count of @object by 1; if the reference
+ * count reaches 0, the resources allocated by @object will be freed
+ */
+void
+cogl_object_unref (void *object);
+
+/**
* CoglUserDataKey:
* @unused: ignored.
*
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
index 0a9074f..9d91e70 100644
--- a/cogl/cogl-types.h
+++ b/cogl/cogl-types.h
@@ -135,27 +135,6 @@ void
cogl_handle_unref (CoglHandle handle);
/**
- * cogl_object_ref: (skip)
- * @object: a #CoglObject
- *
- * Increases the reference count of @object by 1
- *
- * Returns: the @object, with its reference count increased
- */
-void *
-cogl_object_ref (void *object);
-
-/**
- * cogl_object_unref: (skip)
- * @object: a #CoglObject
- *
- * Drecreases the reference count of @object by 1; if the reference
- * count reaches 0, the resources allocated by @object will be freed
- */
-void
-cogl_object_unref (void *object);
-
-/**
* CoglFuncPtr:
*
* The type used by cogl for function pointers, note that this type
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]