aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2016-10-05 17:10:01 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2016-10-05 17:10:01 +0200
commit9563bfcdb4f236f218be52f8ff05bcd6527cac28 (patch)
tree3dd923350419b4d174756e9adc9e27c21f37c55f /gcc
parent37a1d58a10eb8b176c8fac2a25bd8ca8cba0a91e (diff)
downloadgcc-9563bfcdb4f236f218be52f8ff05bcd6527cac28.zip
gcc-9563bfcdb4f236f218be52f8ff05bcd6527cac28.tar.gz
gcc-9563bfcdb4f236f218be52f8ff05bcd6527cac28.tar.bz2
* c-common.c (c_common_reswords): Update comment for C++11.
From-SVN: r240792
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c-family/ChangeLog4
-rw-r--r--gcc/c-family/c-common.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 1a16c6a..ea4278c 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-05 Jakub Jelinek <jakub@redhat.com>
+
+ * c-common.c (c_common_reswords): Update comment for C++11.
+
2016-10-04 Jason Merrill <jason@redhat.com>
* c-common.c (make_tree_vector_from_ctor): New.
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 2fce793..dbef199 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -411,8 +411,8 @@ static int resort_field_decl_cmp (const void *, const void *);
C --std=c89: D_C99 | D_CXXONLY | D_OBJC | D_CXX_OBJC
C --std=c99: D_CXXONLY | D_OBJC
ObjC is like C except that D_OBJC and D_CXX_OBJC are not set
- C++ --std=c98: D_CONLY | D_CXXOX | D_OBJC
- C++ --std=c0x: D_CONLY | D_OBJC
+ C++ --std=c++98: D_CONLY | D_CXX11 | D_OBJC
+ C++ --std=c++11: D_CONLY | D_OBJC
ObjC++ is like C++ except that D_OBJC is not set
If -fno-asm is used, D_ASM is added to the mask. If