diff options
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 2 | ||||
| -rw-r--r-- | libcpp/init.c | 8 |
3 files changed, 11 insertions, 5 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 5be923ea1f6..8013364e6be 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-31 Jason Merrill <jason@redhat.com> + + PR c++/50920 + * include/cpplib.h (enum c_lang): Rename CLK_CXX0X to CLK_CXX11, + CLK_GNUCXX0X to CLK_GNUCXX11. + 2011-10-26 Ed Smith-Rowland <3dw4rd@verizon.net> Implement C++11 user-defined literals. diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 9582b621ab5..518fe945ebb 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -167,7 +167,7 @@ enum cpp_ttype /* C language kind, used when calling cpp_create_reader. */ enum c_lang {CLK_GNUC89 = 0, CLK_GNUC99, CLK_GNUC1X, CLK_STDC89, CLK_STDC94, CLK_STDC99, CLK_STDC1X, - CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX0X, CLK_CXX0X, CLK_ASM}; + CLK_GNUCXX, CLK_CXX98, CLK_GNUCXX11, CLK_CXX11, CLK_ASM}; /* Payload of a NUMBER, STRING, CHAR or COMMENT token. */ struct GTY(()) cpp_string { diff --git a/libcpp/init.c b/libcpp/init.c index 99b65ba339e..bbaa8ae10c3 100644 --- a/libcpp/init.c +++ b/libcpp/init.c @@ -94,11 +94,11 @@ static const struct lang_flags lang_defaults[] = /* STDC1X */ { 1, 0, 1, 0, 1, 1, 1, 1, 0, 0 }, /* GNUCXX */ { 0, 1, 1, 0, 0, 1, 1, 0, 0, 0 }, /* CXX98 */ { 0, 1, 1, 0, 1, 1, 1, 0, 0, 0 }, - /* GNUCXX0X */ { 1, 1, 1, 0, 0, 1, 1, 1, 1, 1 }, - /* CXX0X */ { 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 }, + /* GNUCXX11 */ { 1, 1, 1, 0, 0, 1, 1, 1, 1, 1 }, + /* CXX11 */ { 1, 1, 1, 0, 1, 1, 1, 1, 1, 1 }, /* ASM */ { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0 } - /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and - CXX0X when no longer experimental (when all uses of identifiers + /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX11, and + CXX11 when no longer experimental (when all uses of identifiers in the compiler have been audited for correct handling of extended identifiers). */ }; |
