diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-06-09 16:21:15 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-06-09 16:21:15 +0100 |
commit | 552761f3a83f13d00aa00f4925661463388f48e8 (patch) | |
tree | ab2d0c91f6cea41c721b70f394214ff220220b8e | |
parent | c56d5436d08cb55b529f00dbb29a2b3b44db2692 (diff) | |
download | cogl-552761f3a83f13d00aa00f4925661463388f48e8.tar.gz |
Remove G_CONST_RETURN
It is going to be deprecated by GLib, see bug:
https://bugzilla.gnome.org/show_bug.cgi?id=644611
-rw-r--r-- | cogl/cogl-material-compat.c | 2 | ||||
-rw-r--r-- | cogl/cogl-material-compat.h | 2 | ||||
-rw-r--r-- | cogl/cogl-matrix.h | 2 | ||||
-rw-r--r-- | 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 5df55bab..efee1051 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 495c9413..2e347d51 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 36f21ba9..903d2ea6 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 675ed40b..c7aa3239 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 |