[cogl] Remove G_CONST_RETURN
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl] Remove G_CONST_RETURN
- Date: Thu, 9 Jun 2011 15:24:59 +0000 (UTC)
commit 552761f3a83f13d00aa00f4925661463388f48e8
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Thu Jun 9 16:21:15 2011 +0100
Remove G_CONST_RETURN
It is going to be deprecated by GLib, see bug:
https://bugzilla.gnome.org/show_bug.cgi?id=644611
cogl/cogl-material-compat.c | 2 +-
cogl/cogl-material-compat.h | 2 +-
cogl/cogl-matrix.h | 2 +-
cogl/cogl-pipeline-private.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl-material-compat.c b/cogl/cogl-material-compat.c
index 5df55ba..efee105 100644
--- a/cogl/cogl-material-compat.c
+++ b/cogl/cogl-material-compat.c
@@ -279,7 +279,7 @@ cogl_material_set_layer_matrix (CoglMaterial *material,
layer_index, matrix);
}
-G_CONST_RETURN GList *
+const GList *
cogl_material_get_layers (CoglMaterial *material)
{
return _cogl_pipeline_get_layers (COGL_PIPELINE (material));
diff --git a/cogl/cogl-material-compat.h b/cogl/cogl-material-compat.h
index 495c941..2e347d5 100644
--- a/cogl/cogl-material-compat.h
+++ b/cogl/cogl-material-compat.h
@@ -890,7 +890,7 @@ cogl_material_set_layer_matrix (CoglMaterial *material,
* cogl_material_layer_* functions. The list is owned by Cogl and it
* should not be modified or freed
*/
-G_CONST_RETURN GList *
+const GList *
cogl_material_get_layers (CoglMaterial *material);
/**
diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h
index 36f21ba..903d2ea 100644
--- a/cogl/cogl-matrix.h
+++ b/cogl/cogl-matrix.h
@@ -360,7 +360,7 @@ cogl_matrix_init_from_array (CoglMatrix *matrix,
*
* Return value: a pointer to the float array
*/
-G_CONST_RETURN float *
+const float *
cogl_matrix_get_array (const CoglMatrix *matrix);
#ifdef COGL_ENABLE_EXPERIMENTAL_API
diff --git a/cogl/cogl-pipeline-private.h b/cogl/cogl-pipeline-private.h
index 675ed40..c7aa323 100644
--- a/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl-pipeline-private.h
@@ -1165,7 +1165,7 @@ _cogl_pipeline_prune_to_n_layers (CoglPipeline *pipeline, int n);
* API to support the deprecate cogl_pipeline_layer_xyz functions...
*/
-G_CONST_RETURN GList *
+const GList *
_cogl_pipeline_get_layers (CoglPipeline *pipeline);
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]