diff options
| author | Jason Merrill <jason@redhat.com> | 2016-08-10 18:38:34 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2016-08-10 18:38:34 -0400 |
| commit | 452df4a4e62dc8e2ff2ccd0828cde674025fb292 (patch) | |
| tree | 78189187924bb3f93a58acdb42b07d23584eefc2 /gcc | |
| parent | 99f9d4b1b6bd7f072a84a0b19f0397bfa50008cb (diff) | |
| download | gcc-452df4a4e62dc8e2ff2ccd0828cde674025fb292.zip gcc-452df4a4e62dc8e2ff2ccd0828cde674025fb292.tar.gz gcc-452df4a4e62dc8e2ff2ccd0828cde674025fb292.tar.bz2 | |
* c-cppbuiltin.c (c_cpp_builtins): Define __cpp_if_constexpr.
From-SVN: r239340
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c-family/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C | 6 |
3 files changed, 11 insertions, 0 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index def4e11..13acd93 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2016-08-10 Jason Merrill <jason@redhat.com> + + * c-cppbuiltin.c (c_cpp_builtins): Define __cpp_if_constexpr. + 2016-08-09 Jason Merrill <jason@redhat.com> * c-common.c (c_common_attribute_table): vector_size affects type diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 46c70ac..82ed19d 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -882,6 +882,7 @@ c_cpp_builtins (cpp_reader *pfile) cpp_define (pfile, "__cpp_nontype_template_args=201411"); cpp_define (pfile, "__cpp_range_based_for=201603"); cpp_define (pfile, "__cpp_constexpr=201603"); + cpp_define (pfile, "__cpp_if_constexpr=201606"); } if (flag_concepts) /* Use a value smaller than the 201507 specified in diff --git a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C index f5ed6ab..41b6111 100644 --- a/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C +++ b/gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C @@ -344,6 +344,12 @@ # error "__cpp_hex_float != 201603" #endif +#ifndef __cpp_if_constexpr +# error "__cpp_if_constexpr" +#elif __cpp_if_constexpr != 201606 +# error "__cpp_if_constexpr != 201606" +#endif + #ifdef __has_cpp_attribute # if ! __has_cpp_attribute(maybe_unused) |