diff options
| author | Bruno Haible <bruno@clisp.org> | 2012-02-18 13:51:06 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2012-02-18 22:28:03 +0100 |
| commit | 9ced4c20c2da96e94d505ff8f5c456b259c4d09f (patch) | |
| tree | 00d0a3a72e87a1635fbd1733109239c7a27a4c1d | |
| parent | f7d3edbbf90b2be03a404fa76a2df1d2bd0d7e33 (diff) | |
| download | external_gettext-9ced4c20c2da96e94d505ff8f5c456b259c4d09f.zip external_gettext-9ced4c20c2da96e94d505ff8f5c456b259c4d09f.tar.gz external_gettext-9ced4c20c2da96e94d505ff8f5c456b259c4d09f.tar.bz2 | |
Update from gnulib.
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-runtime/intl/verify.h | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 765a387..a9f8496 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,9 @@ +2012-01-06 Paul Eggert <eggert@cs.ucla.edu> + + doc: C11 and C++11 are now official + * verify.h: Replace references to draft C1X to C11, and to draft C++0X + to C++11. + 2012-01-06 Bruno Haible <bruno@clisp.org> Talk about "native Windows API", not "Woe32". diff --git a/gettext-runtime/intl/verify.h b/gettext-runtime/intl/verify.h index a172f29..f87a08c 100644 --- a/gettext-runtime/intl/verify.h +++ b/gettext-runtime/intl/verify.h @@ -1,6 +1,6 @@ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -21,13 +21,11 @@ # define _GL_VERIFY_H -/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per the - C1X draft N1548 section 6.7.10. This is supported by GCC 4.6.0 and - later, in C mode, and its use here generates easier-to-read diagnostics - when verify (R) fails. +/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. + This is supported by GCC 4.6.0 and later, in C mode, and its use + here generates easier-to-read diagnostics when verify (R) fails. - Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per the - C++0X draft N3242 section 7.(4). + Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11. This will likely be supported by future GCC versions, in C++ mode. Use this only with GCC. If we were willing to slow 'configure' @@ -188,7 +186,7 @@ template <int w> trailing ';'. If R is false, fail at compile-time, preferably with a diagnostic that includes the string-literal DIAGNOSTIC. - Unfortunately, unlike C1X, this implementation must appear as an + Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ # ifdef _GL_HAVE__STATIC_ASSERT @@ -205,7 +203,7 @@ template <int w> # define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) # endif # if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert -# define static_assert _Static_assert /* Draft C1X requires this #define. */ +# define static_assert _Static_assert /* C11 requires this #define. */ # endif # endif |