glib r7634 - in trunk/docs/reference: . glib/tmpl

[timj svn gnome org]

Author: timj
Date: Wed Oct 29 15:14:29 2008
New Revision: 7634
URL: http://svn.gnome.org/viewvc/glib?rev=7634&view=rev

Log:
2008-10-29 16:04:38  Tim Janik  <timj gtk org>

        * glib/tmpl/macros_misc.sgml: Clarified/added docs for
        G_STRINGIFY, G_PASTE and G_STATIC_ASSERT, based on
        patches from Christian Persch and  Christian Dywan.



Modified:
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/glib/tmpl/macros_misc.sgml

Modified: trunk/docs/reference/glib/tmpl/macros_misc.sgml
==============================================================================
--- trunk/docs/reference/glib/tmpl/macros_misc.sgml	(original)
+++ trunk/docs/reference/glib/tmpl/macros_misc.sgml	Wed Oct 29 15:14:29 2008
@@ -96,12 +96,36 @@
 
 <!-- ##### MACRO G_STRINGIFY ##### -->
 <para>
-Accepts a macro or a string and converts it into a string.
+Accepts a macro or a string and converts it into a string after
+preprocessor argument expansion.
 </para>
 
 @macro_or_string: a macro or a string.
 
 
+<!-- ##### MACRO G_PASTE ##### -->
+<para>
+Yields a new preprocessor pasted identifier 'identifier1identifier2'
+from its expanded arguments 'identifier1' and 'identifier2'.
+</para>
+
+ identifier1: an identifier
+ identifier2: an identifier
+ Since: 2.20
+
+
+<!-- ##### MACRO G_STATIC_ASSERT ##### -->
+<para>
+The G_STATIC_ASSERT macro lets the programmer check a condition at compile time,
+the condition needs to be compile time computable.
+The macro can be used in any place where a <literal>typedef</literal> is valid.
+The macro should only be used once per source code line.
+</para>
+
+ expr: a constant expression.
+ Since: 2.20
+
+
 <!-- ##### MACRO G_GNUC_EXTENSION ##### -->
 <para>
 Expands to <literal>__extension__</literal> when <command>gcc</command> is