mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-05-15 10:23:11 +02:00
Deprecate G_GNUC_(PRETTY)_FUNCTION.
2008-01-27 Matthias Clasen <mclasen@redhat.com> * glib/gmacros.h: Deprecate G_GNUC_(PRETTY)_FUNCTION. svn path=/trunk/; revision=6389
This commit is contained in:
parent
69c903e5b2
commit
7bfc60de2e
@ -1,3 +1,7 @@
|
|||||||
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* glib/gmacros.h: Deprecate G_GNUC_(PRETTY)_FUNCTION.
|
||||||
|
|
||||||
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* m4macros/glib-gettext.m4: Remove AC_CANONICAL_HOST from
|
* m4macros/glib-gettext.m4: Remove AC_CANONICAL_HOST from
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* glib/tmpl/macros_misc.sgml: Document G_GNUC_(PRETTY)_FUNCTION
|
||||||
|
as deprecated.
|
||||||
|
|
||||||
2008-01-24 Matthias Clasen <mclasen@redhat.com>
|
2008-01-24 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* gio/migration.xml: Some more
|
* gio/migration.xml: Some more
|
||||||
|
@ -264,25 +264,21 @@ is ignored. See the GNU C documentation for details.
|
|||||||
|
|
||||||
<!-- ##### MACRO G_GNUC_FUNCTION ##### -->
|
<!-- ##### MACRO G_GNUC_FUNCTION ##### -->
|
||||||
<para>
|
<para>
|
||||||
Expands to the GNU C <literal>__FUNCTION__</literal> variable if the
|
Expands to "" on all modern compilers, and to <literal>__FUNCTION__</literal>
|
||||||
compiler is <command>gcc</command>, or "" if it isn't. The GNU C
|
on <command>gcc</command> version 2.x. Don't use it.
|
||||||
<literal>__FUNCTION__</literal> variable contains the name of the
|
|
||||||
current function. See the GNU C documentation for details.
|
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@Deprecated: 2.14
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO G_GNUC_PRETTY_FUNCTION ##### -->
|
<!-- ##### MACRO G_GNUC_PRETTY_FUNCTION ##### -->
|
||||||
<para>
|
<para>
|
||||||
Expands to the GNU C <literal>__PRETTY_FUNCTION__</literal> variable
|
Expands to "" on all modern compilers, and to
|
||||||
if the compiler is <command>gcc</command>, or "" if it isn't.
|
<literal>__PRETTY_FUNCTION__</literal> on <command>gcc</command> version 2.x.
|
||||||
The GNU C <literal>__PRETTY_FUNCTION__</literal> variable contains the
|
Don't use it.
|
||||||
name of the current function. For a C program this is the same as the
|
|
||||||
<literal>__FUNCTION__</literal> variable but for C++ it also includes
|
|
||||||
extra information such as the class and function prototype. See the
|
|
||||||
GNU C documentation for details.
|
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
@Deprecated: 2.14
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO G_GNUC_NO_INSTRUMENT ##### -->
|
<!-- ##### MACRO G_GNUC_NO_INSTRUMENT ##### -->
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* gbufferedinputstream.c:
|
||||||
|
* ginputstream.c:
|
||||||
|
* goutputstream.c: Replace uses of G_GNUC_PRETTY_FUNCTION by
|
||||||
|
__FUNCTION__.
|
||||||
|
|
||||||
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* glocalfile.c: Avoid trivial differences in translatable strings.
|
* glocalfile.c: Avoid trivial differences in translatable strings.
|
||||||
|
@ -481,7 +481,7 @@ g_buffered_input_stream_fill_async (GBufferedInputStream *stream,
|
|||||||
user_data,
|
user_data,
|
||||||
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"),
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
__FUNCTION__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,8 +183,7 @@ g_input_stream_read (GInputStream *stream,
|
|||||||
if (((gssize) count) < 0)
|
if (((gssize) count) < 0)
|
||||||
{
|
{
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"), __FUNCTION__);
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -316,8 +315,7 @@ g_input_stream_skip (GInputStream *stream,
|
|||||||
if (((gssize) count) < 0)
|
if (((gssize) count) < 0)
|
||||||
{
|
{
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"), __FUNCTION__);
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -559,7 +557,7 @@ g_input_stream_read_async (GInputStream *stream,
|
|||||||
user_data,
|
user_data,
|
||||||
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"),
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
__FUNCTION__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -684,7 +682,7 @@ g_input_stream_skip_async (GInputStream *stream,
|
|||||||
user_data,
|
user_data,
|
||||||
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"),
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
__FUNCTION__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,8 +190,7 @@ g_output_stream_write (GOutputStream *stream,
|
|||||||
if (((gssize) count) < 0)
|
if (((gssize) count) < 0)
|
||||||
{
|
{
|
||||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"), __FUNCTION__);
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -646,7 +645,7 @@ g_output_stream_write_async (GOutputStream *stream,
|
|||||||
user_data,
|
user_data,
|
||||||
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
|
||||||
_("Too large count value passed to %s"),
|
_("Too large count value passed to %s"),
|
||||||
G_GNUC_PRETTY_FUNCTION);
|
__FUNCTION__);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,6 +108,7 @@
|
|||||||
#define G_GNUC_WARN_UNUSED_RESULT
|
#define G_GNUC_WARN_UNUSED_RESULT
|
||||||
#endif /* __GNUC__ */
|
#endif /* __GNUC__ */
|
||||||
|
|
||||||
|
#ifndef G_DISABLE_DEPRECATED
|
||||||
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
|
||||||
* macros, so we can refer to them as strings unconditionally.
|
* macros, so we can refer to them as strings unconditionally.
|
||||||
* usage not-recommended since gcc-3.0
|
* usage not-recommended since gcc-3.0
|
||||||
@ -119,6 +120,7 @@
|
|||||||
#define G_GNUC_FUNCTION ""
|
#define G_GNUC_FUNCTION ""
|
||||||
#define G_GNUC_PRETTY_FUNCTION ""
|
#define G_GNUC_PRETTY_FUNCTION ""
|
||||||
#endif /* !__GNUC__ */
|
#endif /* !__GNUC__ */
|
||||||
|
#endif /* !G_DISABLE_DEPRECATED */
|
||||||
|
|
||||||
#define G_STRINGIFY(macro_or_string) G_STRINGIFY_ARG (macro_or_string)
|
#define G_STRINGIFY(macro_or_string) G_STRINGIFY_ARG (macro_or_string)
|
||||||
#define G_STRINGIFY_ARG(contents) #contents
|
#define G_STRINGIFY_ARG(contents) #contents
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2008-01-27 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
|
* gthread-posix.c:
|
||||||
|
* gthread-win32.c: Replace uses of G_GNUC_PRETTY_FUNCTION
|
||||||
|
by __FUNCTION__.
|
||||||
|
|
||||||
2008-01-21 Matthias Clasen <mclasen@redhat.com>
|
2008-01-21 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
|
||||||
* === Released 2.15.3 ===
|
* === Released 2.15.3 ===
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
int error = (err); \
|
int error = (err); \
|
||||||
if (error) \
|
if (error) \
|
||||||
g_error ("file %s: line %d (%s): error '%s' during '%s'", \
|
g_error ("file %s: line %d (%s): error '%s' during '%s'", \
|
||||||
__FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, \
|
__FILE__, __LINE__, __FUNCTION__, \
|
||||||
g_strerror (error), name); \
|
g_strerror (error), name); \
|
||||||
}G_STMT_END
|
}G_STMT_END
|
||||||
|
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
#define win32_check_for_error(what) G_STMT_START{ \
|
#define win32_check_for_error(what) G_STMT_START{ \
|
||||||
if (!(what)) \
|
if (!(what)) \
|
||||||
g_error ("file %s: line %d (%s): error %s during %s", \
|
g_error ("file %s: line %d (%s): error %s during %s", \
|
||||||
__FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, \
|
__FILE__, __LINE__, __FUNCTION__, \
|
||||||
g_win32_error_message (GetLastError ()), #what); \
|
g_win32_error_message (GetLastError ()), #what); \
|
||||||
}G_STMT_END
|
}G_STMT_END
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user