| Message ID | 406FB6D2-6A2F-44A6-90CD-4B9BCCB38FB4@comcast.net |
|---|---|
| State | New |
| Headers | show |
On 10/09/2014 05:54 PM, Mike Stump wrote: > On Oct 9, 2014, at 11:56 AM, Uros Bizjak <ubizjak@gmail.com> wrote: >> 2014-10-09 Uros Bizjak <ubizjak@gmail.com> >> >> * g++.dg/cpp1y/feat-cxx14.C: Variable templates not in yet. >> (dg-do): Use c++1y target. >> >> Tested on x86_64. OK for branch? > So, I need Ed or Jason to review it… > Yes, please put this in. cxx14 was added to 5.0 and shadowed the error about variable templates. Argh. The patch is good. Thank you all! Ed
On Oct 9, 2014, at 5:09 PM, Ed Smith-Rowland <3dw4rd@verizon.net> wrote: > On 10/09/2014 05:54 PM, Mike Stump wrote: >> On Oct 9, 2014, at 11:56 AM, Uros Bizjak <ubizjak@gmail.com> wrote: >>> 2014-10-09 Uros Bizjak <ubizjak@gmail.com> >>> >>> * g++.dg/cpp1y/feat-cxx14.C: Variable templates not in yet. >>> (dg-do): Use c++1y target. >>> >>> Tested on x86_64. OK for branch? Ok given the below review. >> So, I need Ed or Jason to review it… >> > Yes, please put this in. > cxx14 was added to 5.0 and shadowed the error about variable templates. > Argh. > > The patch is good.
Index: g++.dg/cpp1y/feat-cxx14.C =================================================================== --- g++.dg/cpp1y/feat-cxx14.C (revision 216044) +++ g++.dg/cpp1y/feat-cxx14.C (working copy) @@ -1,4 +1,4 @@ -// { dg-do compile { target c++14 } } +// { dg-do compile { target c++1y } } // { dg-options "-I${srcdir}/g++.dg/cpp1y -I${srcdir}/g++.dg/cpp1y/testinc" } // Begin C++11 tests. @@ -125,10 +125,9 @@ # error "__cpp_aggregate_nsdmi" #endif -#ifndef __cpp_variable_templates +// Variable templates not in yet. +#ifdef __cpp_variable_templates # error "__cpp_variable_templates" -#elif __cpp_variable_templates != 201304 -# error "__cpp_variable_templates != 201304" #endif #ifndef __cpp_digit_separators