diff options
| author | emsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-10 15:53:12 +0000 |
|---|---|---|
| committer | emsr <emsr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-11-10 15:53:12 +0000 |
| commit | 3aa2fa443f8de74ae74fb13ec81ce2edc1b29a82 (patch) | |
| tree | cdf2ab35de7a1da1bcda63af97f127dea644c2ce /libcpp/directives.c | |
| parent | 05d5a6da74f67ca19d687dcb96bc08f03cba78e4 (diff) | |
libcpp:
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* include/cpplib.h (cpp_callbacks): Add has_attribute.
* internal.h (lexer_state): Add in__has_attribute__.
* directives.c (lex_macro_node): Prevent use of __has_attribute__
as a macro.
* expr.c (parse_has_attribute): New function; (eval_token): Look for
__has_attribute__ and route to parse_has_attribute.
* identifiers.c (_cpp_init_hashtable): Initialize n__has_attribute__.
* pch.c (cpp_read_state): Initialize n__has_attribute__.
* traditional.c (enum ls): Add ls_has_attribute, ls_has_attribute_close;
(_cpp_scan_out_logical_line): Attend to __has_attribute__.
gcc/c-family:
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* c-cppbuiltin.c (__has_attribute, __has_cpp_attribute): New macros;
(__cpp_rtti, __cpp_exceptions): New macros for C++98;
(__cpp_range_based_for, __cpp_initializer_lists,
__cpp_delegating_constructors, __cpp_nsdmi,
__cpp_inheriting_constructors, __cpp_ref_qualifiers): New macros
for C++11; (__cpp_attribute_deprecated): Remove in favor of
__has_cpp_attribute.
* c-lex.c (cb_has_attribute): New callback CPP function;
(init_c_lex): Set has_attribute callback.
gcc/testsuite:
2014-11-10 Edward Smith-Rowland <3dw4rd@verizon.net>
* g++.dg/cpp1y/feat-cxx11.C: Test new feature macros for C++98
and C++11; Test existence of __has_cpp_attribute; Test C++11
attributes.
* g++.dg/cpp1y/feat-cxx11-neg.C: Ditto.
* g++.dg/cpp1y/feat-cxx14.C: Ditto and test for C++14 attributes.
* g++.dg/cpp1y/feat-cxx98.C: Test new feature macros for C++98.
* g++.dg/cpp1y/feat-cxx98-neg.C: Ditto.
* g++.dg/cpp1y/feat-neg.C: Test that __cpp_rtti, _cpp_exceptions
will be undefined for -fno-rtti -fno-exceptions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@217292 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/directives.c')
| -rw-r--r-- | libcpp/directives.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libcpp/directives.c b/libcpp/directives.c index 0a8569aeebf..ba92ec2a6e4 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -571,6 +571,10 @@ lex_macro_node (cpp_reader *pfile, bool is_def_or_undef) || node == pfile->spec_nodes.n__has_include_next__)) cpp_error (pfile, CPP_DL_ERROR, "\"__has_include__\" cannot be used as a macro name"); + else if (is_def_or_undef + && node == pfile->spec_nodes.n__has_attribute__) + cpp_error (pfile, CPP_DL_ERROR, + "\"__has_attribute__\" cannot be used as a macro name"); else if (! (node->flags & NODE_POISONED)) return node; } |