From 13b380a3257189e5232010c982b8c691b348482c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 19 Oct 2015 22:48:36 -0400 Subject: c-cppbuiltin.c (c_cpp_builtins): Define __cpp_enumerator_attributes... * c-cppbuiltin.c (c_cpp_builtins): Define __cpp_enumerator_attributes, __cpp_fold_expressions, __cpp_unicode_characters. From-SVN: r229017 --- gcc/c-family/c-cppbuiltin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gcc/c-family/c-cppbuiltin.c') diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 35d246b..cd6fd51 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -833,7 +833,8 @@ c_cpp_builtins (cpp_reader *pfile) if (cxx_dialect >= cxx11) { /* Set feature test macros for C++11. */ - cpp_define (pfile, "__cpp_unicode_characters=200704"); + if (cxx_dialect <= cxx14) + cpp_define (pfile, "__cpp_unicode_characters=200704"); cpp_define (pfile, "__cpp_raw_strings=200710"); cpp_define (pfile, "__cpp_unicode_literals=200710"); cpp_define (pfile, "__cpp_user_defined_literals=200809"); @@ -869,9 +870,12 @@ c_cpp_builtins (cpp_reader *pfile) if (cxx_dialect > cxx14) { /* Set feature test macros for C++1z. */ + cpp_define (pfile, "__cpp_unicode_characters=201411"); cpp_define (pfile, "__cpp_static_assert=201411"); cpp_define (pfile, "__cpp_namespace_attributes=201411"); + cpp_define (pfile, "__cpp_enumerator_attributes=201411"); cpp_define (pfile, "__cpp_nested_namespace_definitions=201411"); + cpp_define (pfile, "__cpp_fold_expressions=201411"); } if (flag_concepts) /* Use a value smaller than the 201507 specified in -- cgit v1.1