aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-03 12:52:18 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-10-03 12:52:18 +0000
commite03a3b1a87e56f50d060d0c67db048052ff76ab1 (patch)
treea3810a3104dd710f405141fc01e494db94d10f1b
parentb4b7129fb3221c87ac413469fc7352d159e6f218 (diff)
Document value of __cplusplus for C++14
* doc/cpp.texi (Standard Predefined Macros): Document value of __cplusplus for C++14. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228448 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/doc/cpp.texi11
2 files changed, 12 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7fe0196c621..b74a73ae940 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-10-03 Jonathan Wakely <jwakely@redhat.com>
+
+ * doc/cpp.texi (Standard Predefined Macros): Document value of
+ __cplusplus for C++14.
+
2015-10-02 Bernd Schmidt <bernds@codesourcery.com>
* gcc.c (process_command): Use spec_machine rather than
diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi
index 118ba7c2130..7718d14da36 100644
--- a/gcc/doc/cpp.texi
+++ b/gcc/doc/cpp.texi
@@ -1925,10 +1925,13 @@ 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. 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}.
+selected, the value of the macro is
+@code{199711L} for the 1998 C++ standard,
+@code{201103L} for the 2011 C++ standard,
+@code{201402L} for the 2014 C++ standard,
+or an unspecified value strictly larger than @code{201402L} for the
+experimental languages enabled by @option{-std=c++1z} and
+@option{-std=gnu++1z}.
@item __OBJC__
This macro is defined, with value 1, when the Objective-C compiler is in