diff options
| -rw-r--r-- | gcc/c-family/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/c-family/c-cppbuiltin.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C | 18 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C | 37 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C | 23 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C | 3 |
8 files changed, 77 insertions, 34 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 4052b5edc74..a28ef60b984 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,13 @@ +2014-11-01 Edward Smith-Rowland <3dw4rd@verizon.net> + + * g++.dg/cpp1y/feat-cxx11.C: Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx11-neg.C: Add aggregate NSDMI test. + Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx14.C: Enable aggregate NSDMI test. + Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx98-neg.C: Ditto + * g++.dg/cpp1y/feat-cxx98.C: Commentary. + 2014-10-29 Richard Sandiford <richard.sandiford@arm.com> * c-common.c, c-common.h, c-cppbuiltin.c, c-lex.c: Remove redundant diff --git a/gcc/c-family/c-cppbuiltin.c b/gcc/c-family/c-cppbuiltin.c index 803f146ad02..26fabc2e4c4 100644 --- a/gcc/c-family/c-cppbuiltin.c +++ b/gcc/c-family/c-cppbuiltin.c @@ -841,7 +841,7 @@ c_cpp_builtins (cpp_reader *pfile) //cpp_undef (pfile, "__cpp_constexpr"); //cpp_define (pfile, "__cpp_constexpr=201304"); cpp_define (pfile, "__cpp_decltype_auto=201304"); - //cpp_define (pfile, "__cpp_aggregate_nsdmi=201304"); + cpp_define (pfile, "__cpp_aggregate_nsdmi=201304"); cpp_define (pfile, "__cpp_variable_templates=201304"); cpp_define (pfile, "__cpp_digit_separators=201309"); //cpp_define (pfile, "__cpp_sized_deallocation=201309"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ac737184b54..969a4f85edd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2014-11-01 Edward Smith-Rowland <3dw4rd@verizon.net> + + * g++.dg/cpp1y/feat-cxx11.C: Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx11-neg.C: Add aggregate NSDMI test. + Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx14.C: Enable aggregate NSDMI test. + Commentary and rearrangement of tests. + * g++.dg/cpp1y/feat-cxx98-neg.C: Ditto + * g++.dg/cpp1y/feat-cxx98.C: Commentary. + 2014-10-31 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/63659 diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C index 6310ce666e3..8442d613f8e 100644 --- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C +++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C @@ -1,7 +1,7 @@ // { dg-do compile { target c++11_only } } // { dg-options "-pedantic-errors" } -// These *are* defined in C++14 onwards. +// C++14 features: #ifndef __cpp_binary_literals # error "__cpp_binary_literals" // { dg-error "error" } @@ -31,11 +31,19 @@ # error "__cpp_digit_separators" // { dg-error "error" } #endif -// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn). -//#ifndef __cpp_attribute_deprecated -//# error "__cpp_attribute_deprecated" -//#endif +#ifndef __cpp_aggregate_nsdmi +# error "__cpp_aggregate_nsdmi" // { dg-error "error" } +#endif + +// Array TS features: #ifndef __cpp_runtime_arrays # error "__cpp_runtime_arrays" // { dg-error "error" } #endif + +// Attribute checks: + +// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn). +//#ifndef __cpp_attribute_deprecated +//# error "__cpp_attribute_deprecated" +//#endif diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C index 6ebc0c84cb0..b47311f9a16 100644 --- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C +++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx11.C @@ -1,6 +1,8 @@ // { dg-do compile } // { dg-options "-std=gnu++11" } +// C++11 features: + #ifndef __cpp_unicode_characters # error "__cpp_unicode_characters" #elif __cpp_unicode_characters != 200704 @@ -73,13 +75,17 @@ # error "__cpp_alias_templates != 200704" #endif -// These C++14 features are allowed in C++11 in non-ANSI modes. +// C++14 features allowed in C++11 in non-ANSI modes: + #ifndef __cpp_binary_literals # error "__cpp_binary_literals" #elif __cpp_binary_literals != 201304 # error "__cpp_binary_literals != 201304" #endif +// Attribute checks: + +// Attribute [[deprecated]] is allowed in C++11 as an extension (with pedwarn). #ifndef __cpp_attribute_deprecated # error "__cpp_attribute_deprecated" #elif __cpp_attribute_deprecated != 201309 diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C index 18ff0988465..aa58fe17510 100644 --- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C +++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C @@ -1,7 +1,7 @@ // { dg-do compile { target c++14 } } // { dg-options "-I${srcdir}/g++.dg/cpp1y -I${srcdir}/g++.dg/cpp1y/testinc" } -// Begin C++11 tests. +// C++11 features: #ifndef __cpp_unicode_characters # error "__cpp_unicode_characters" @@ -75,7 +75,7 @@ # error "__cpp_alias_templates != 200704" #endif -// Begin C++14 tests. +// C++14 features: #ifndef __cpp_binary_literals # error "__cpp_binary_literals" @@ -114,15 +114,10 @@ # error "__cpp_return_type_deduction != 201304" #endif -#ifndef __cpp_runtime_arrays -# error "__cpp_runtime_arrays" -#elif __cpp_runtime_arrays != 201304 -# error "__cpp_runtime_arrays != 201304" -#endif - -// Aggregate initializers not in yet. -#ifdef __cpp_aggregate_nsdmi +#ifndef __cpp_aggregate_nsdmi # error "__cpp_aggregate_nsdmi" +#elif __cpp_aggregate_nsdmi != 201304 +# error "__cpp_aggregate_nsdmi != 201304" #endif #ifndef __cpp_variable_templates @@ -137,18 +132,28 @@ # error "__cpp_digit_separators != 201309" #endif +// Sized deallocation not in yet. +#ifdef __cpp_sized_deallocation +# error "__cpp_sized_deallocation" +#endif + +// Array TS features: + +#ifndef __cpp_runtime_arrays +# error "__cpp_runtime_arrays" +#elif __cpp_runtime_arrays != 201304 +# error "__cpp_runtime_arrays != 201304" +#endif + +// Attribute checks: + #ifndef __cpp_attribute_deprecated # error "__cpp_attribute_deprecated" #elif __cpp_attribute_deprecated != 201309 # error "__cpp_attribute_deprecated != 201309" #endif -// Sized deallocation not in yet. -#ifdef __cpp_sized_deallocation -# error "__cpp_sized_deallocation" -#endif - -// Begin include checks. +// Include checks: // Check for __has_include macro. #ifndef __has_include diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C index b99b57efe0e..3d75f98fd52 100644 --- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C +++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C @@ -1,6 +1,8 @@ // { dg-do compile { target c++98_only } } // { dg-options "-ansi" } +// C++11 features: + #ifndef __cpp_runtime_arrays # error "__cpp_runtime_arrays" // { dg-error "error" } #endif @@ -53,9 +55,9 @@ # error "__cpp_alias_templates" // { dg-error "error" } #endif -// C++14 +// C++14 features: -// C++98 gets binary literals. +// C++98 gets binary literals in non-ANSI modes. //#ifndef __cpp_binary_literals //# error "__cpp_binary_literals" //#endif @@ -76,10 +78,9 @@ # error "__cpp_return_type_deduction" // { dg-error "error" } #endif -// Aggregate initializers not in yet. -//#ifdef __cpp_aggregate_nsdmi -//# error "__cpp_aggregate_nsdmi" -//#endif +#ifndef __cpp_aggregate_nsdmi +# error "__cpp_aggregate_nsdmi" // { dg-error "error" } +#endif #ifndef __cpp_variable_templates # error "__cpp_variable_templates" // { dg-error "error" } @@ -89,11 +90,13 @@ # error "__cpp_digit_separators" // { dg-error "error" } #endif -#ifndef __cpp_attribute_deprecated -# error "__cpp_attribute_deprecated" // { dg-error "error" } -#endif - // Sized deallocation not in yet. //#ifdef __cpp_sized_deallocation //# error "__cpp_sized_deallocation" //#endif + +// Attribute checks: + +#ifndef __cpp_attribute_deprecated +# error "__cpp_attribute_deprecated" // { dg-error "error" } +#endif diff --git a/gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C b/gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C index a0a2b75e30b..e6b3d77252e 100644 --- a/gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C +++ b/gcc/testsuite/g++.dg/cpp1y/feat-cxx98.C @@ -1,7 +1,8 @@ // { dg-do compile { target c++98_only } } // { dg-options "" } -// These C++14 features are allowed in C++98 in non-ANSI modes. +// C++14 features allowed in C++98 in non-ANSI modes: + #ifndef __cpp_binary_literals # error "__cpp_binary_literals" #elif __cpp_binary_literals != 201304 |