luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Deprecate G_CONST_RETURN"

Browse Source 
This reverts commit a7fc7909dad9b88e8b2d1c6cde801e8888bdfc36.

The deprecations was not discussed except on Bugzilla:

https://bugzilla.gnome.org/show_bug.cgi?id=644611
This commit is contained in:
Emmanuele Bassi 2011-03-15 09:02:08 +00:00
parent d679a7659f
commit 0c1acc7e74
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/glib/tmpl/macros.sgml
View File

@ -227,6 +227,5 @@ turn it off. This macro should only be used for return values and for
<emphasis>in</emphasis> parameters. <emphasis>in</emphasis> parameters.
</para> </para>
@Deprecated: 2.30: API providers should replace all existing uses with
<literal>const</literal> and API consumers should adjust their code
accordingly.

2
glib/gmacros.h
View File

@ -250,13 +250,11 @@
* (usually char*) are const or not. Don't try using this feature for * (usually char*) are const or not. Don't try using this feature for
* functions with C++ linkage. * functions with C++ linkage.
*/ */
#ifndef G_DISABLE_DEPRECATED
#ifdef G_DISABLE_CONST_RETURNS #ifdef G_DISABLE_CONST_RETURNS
#define G_CONST_RETURN #define G_CONST_RETURN
#else #else
#define G_CONST_RETURN const #define G_CONST_RETURN const
#endif #endif
#endif
/* /*
* The G_LIKELY and G_UNLIKELY macros let the programmer give hints to * The G_LIKELY and G_UNLIKELY macros let the programmer give hints to