diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-24 19:33:54 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-04-24 19:33:54 +0000 |
| commit | 1638c736c1a99cc0a108d3f3e54f84510911206b (patch) | |
| tree | 91930b32804dd6992b551ef2b873cca0c78f0181 /libcpp/lex.c | |
| parent | af08cacd3b5632a06ce31e3a65e1c94d2fbfa256 (diff) | |
| download | gcc-1638c736c1a99cc0a108d3f3e54f84510911206b.tar.gz | |
/libcpp
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* include/cpplib.h (enum c_lang): Add CLK_GNUCXX1Y and CLK_CXX1Y.
* init.c (lang_defaults): Add defaults for the latter.
(cpp_init_builtins): Define __cplusplus as 201300L for the latter.
* lex.c (_cpp_lex_direct): Update.
/gcc/c-family
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* c-opts.c (set_std_cxx11): Use CLK_CXX1Y and CLK_GNUCXX1Y.
/gcc/testsuite
2013-04-24 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/cpp1y/cplusplus.C: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198261 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/lex.c')
| -rw-r--r-- | libcpp/lex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpp/lex.c b/libcpp/lex.c index 570c00733cb..3e59d40d32e 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -2298,8 +2298,8 @@ _cpp_lex_direct (cpp_reader *pfile) is neither : nor >, the < is treated as a preprocessor token by itself". */ if (CPP_OPTION (pfile, cplusplus) - && (CPP_OPTION (pfile, lang) == CLK_CXX11 - || CPP_OPTION (pfile, lang) == CLK_GNUCXX11) + && CPP_OPTION (pfile, lang) != CLK_CXX98 + && CPP_OPTION (pfile, lang) != CLK_GNUCXX && buffer->cur[1] == ':' && buffer->cur[2] != ':' && buffer->cur[2] != '>') break; |