aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-06-19 09:03:07 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-06-19 09:03:07 +0000
commite952afba8fccca783802218ecaa3518f8dfc8aaa (patch)
treee0fe9964848ac1bdac6ac425134f10b011ce08aa /gcc
parent6be8258d837c78d23026d1b1c57252ef790b8e3d (diff)
downloadgcc-e952afba8fccca783802218ecaa3518f8dfc8aaa.zip
gcc-e952afba8fccca783802218ecaa3518f8dfc8aaa.tar.gz
gcc-e952afba8fccca783802218ecaa3518f8dfc8aaa.tar.bz2
re PR c++/56544 (documentation for __cplusplus is out of date)
2013-06-19 Paolo Carlini <paolo.carlini@oracle.com> PR c++/56544 * doc/cpp.texi [Standard Predefined Macros, __cplusplus]: Document that now in C++ the value is correct per the C++ standards. From-SVN: r200193
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/doc/cpp.texi10
2 files changed, 11 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c12d842..53a6cde 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-19 Paolo Carlini <paolo.carlini@oracle.com>
+
+ PR c++/56544
+ * doc/cpp.texi [Standard Predefined Macros, __cplusplus]: Document
+ that now in C++ the value is correct per the C++ standards.
+
2013-06-19 Richard Biener <rguenther@suse.de>
* expr.c (expand_expr_real_1): Use SCOPE_FILE_SCOPE_P to check
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index c605b3b..7ff04cd 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -1926,11 +1926,11 @@ facilities of the standard C library available.
This macro is defined when the C++ compiler is in use. You can use
@code{__cplusplus} to test whether a header is compiled by a C compiler
or a C++ compiler. This macro is similar to @code{__STDC_VERSION__}, in
-that it expands to a version number. A fully conforming implementation
-of the 1998 C++ standard will define this macro to @code{199711L}. The
-GNU C++ compiler is not yet fully conforming, so it uses @code{1}
-instead. It is hoped to complete the implementation of standard C++
-in the near future.
+that it expands to a version number. Depending on the language standard
+selected, the value of the macro is @code{199711L}, as mandated by the
+1998 C++ standard; @code{201103L}, per the 2011 C++ standard; an
+unspecified value strictly larger than @code{201103L} for the experimental
+languages enabled by @option{-std=c++1y} and @option{-std=gnu++1y}.
@item __OBJC__
This macro is defined, with value 1, when the Objective-C compiler is in