diff options
| author | Jason Merrill <jason@redhat.com> | 2015-07-01 15:25:50 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-07-01 15:25:50 -0400 |
| commit | 36a85135b746a41cebcd738193c3e238f5d0399e (patch) | |
| tree | 50e3142b411e0b4efbac25a6dc5ec901f7ea8004 /gcc/cp | |
| parent | e7fa68d55551081342ef3b7eaf1a02639cb57053 (diff) | |
| download | gcc-36a85135b746a41cebcd738193c3e238f5d0399e.zip gcc-36a85135b746a41cebcd738193c3e238f5d0399e.tar.gz gcc-36a85135b746a41cebcd738193c3e238f5d0399e.tar.bz2 | |
c-common.h (D_CXX11): Rename from D_CXX0X.
gcc/c-family/
* c-common.h (D_CXX11): Rename from D_CXX0X.
(RID_FIRST_CXX11, RID_LAST_CXX11): Rename from *_CXX0X.
* c-common.c: Adjust.
gcc/cp/
* lex.c (init_reswords): s/CXX0X/CXX11/.
* parser.c (cp_lexer_get_preprocessor_token): Likewise.
From-SVN: r225273
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/lex.c | 2 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3073d7b..dacc828 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2015-07-01 Jason Merrill <jason@redhat.com> + * lex.c (init_reswords): s/CXX0X/CXX11/. + * parser.c (cp_lexer_get_preprocessor_token): Likewise. + * mangle.c (write_CV_qualifiers_for_type, write_nested_name): Attribute mangling is now -fabi-version=10. diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 915fbdd..d8ee8e3 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -174,7 +174,7 @@ init_reswords (void) int mask = 0; if (cxx_dialect < cxx11) - mask |= D_CXX0X; + mask |= D_CXX11; if (flag_no_asm) mask |= D_ASM | D_EXT; if (flag_no_gnu_keywords) diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 35191a1..8d8ec30 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -791,8 +791,8 @@ cp_lexer_get_preprocessor_token (cp_lexer *lexer, cp_token *token) else { if (warn_cxx11_compat - && C_RID_CODE (token->u.value) >= RID_FIRST_CXX0X - && C_RID_CODE (token->u.value) <= RID_LAST_CXX0X) + && C_RID_CODE (token->u.value) >= RID_FIRST_CXX11 + && C_RID_CODE (token->u.value) <= RID_LAST_CXX11) { /* Warn about the C++0x keyword (but still treat it as an identifier). */ |