c-cppbuiltin.c (__cpp_sized_deallocation): Uncomment and move macro.

c-family/

2014-12-20  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* c-cppbuiltin.c (__cpp_sized_deallocation): Uncomment and move macro.
	Control macro with flag_sized_deallocation.


testsuite/

2014-12-20  Edward Smith-Rowland  <3dw4rd@verizon.net>

	* g++.dg/cpp1y/feat-cxx98-neg.C: Enable __cpp_sized_deallocation test.
	* g++.dg/cpp1y/feat-cxx14.C: Ditto.
	* g++.dg/cpp1y/feat-cxx11-neg.C: Ditto and move tests for consistent
	order.
	* g++.dg/cpp1y/feat-sized-dealloc-neg.C: New.
	* g++.dg/cpp1y/feat-sized-dealloc.C: New.

From-SVN: r218986

gcc/c-family/ChangeLog

+2014-12-20  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+	* c-cppbuiltin.c (__cpp_sized_deallocation): Uncomment and move macro.
+	Control macro with flag_sized_deallocation.
+
 2014-12-20  Martin Uecker <uecker@eecs.berkeley.edu>
 
 	* c.opt (Wdiscarded-array-qualifiers): New option.

gcc/c-family/c-cppbuiltin.c

@@ -866,8 +866,9 @@ c_cpp_builtins (cpp_reader *pfile)
 	  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");
 	}
+      if (flag_sized_deallocation)
+	cpp_define (pfile, "__cpp_sized_deallocation=201309");
     }
   /* Note that we define this for C as well, so that we know if
      __attribute__((cleanup)) will interface with EH.  */

gcc/testsuite/ChangeLog

+2014-12-19  Edward Smith-Rowland  <3dw4rd@verizon.net>
+
+	* g++.dg/cpp1y/feat-cxx98-neg.C: Enable __cpp_sized_deallocation test.
+	* g++.dg/cpp1y/feat-cxx14.C: Ditto.
+	* g++.dg/cpp1y/feat-cxx11-neg.C: Ditto and move tests for consistent
+	order.
+	* g++.dg/cpp1y/feat-sized-dealloc-neg.C: New.
+	* g++.dg/cpp1y/feat-sized-dealloc.C: New.
+
 2014-12-20  Martin Uecker <uecker@eecs.berkeley.edu>
 
 	* gcc.dg/Wwrite-strings-1.c: Change dg-warning.

gcc/testsuite/g++.dg/cpp1y/feat-cxx11-neg.C

@@ -22,6 +22,10 @@
 #  error "__cpp_return_type_deduction" // { dg-error "error" }
 #endif
 
+#ifndef __cpp_aggregate_nsdmi
+#  error "__cpp_aggregate_nsdmi" // { dg-error "error" }
+#endif
+
 #ifndef __cpp_variable_templates
 #  error "__cpp_variable_templates" // { dg-error "error" }
 #endif
@@ -30,8 +34,8 @@
 #  error "__cpp_digit_separators" // { dg-error "error" }
 #endif
 
-#ifndef __cpp_aggregate_nsdmi
-#  error "__cpp_aggregate_nsdmi" // { dg-error "error" }
+#ifndef __cpp_sized_deallocation
+#  error "__cpp_sized_deallocation" // { dg-error "error" }
 #endif
 
 //  Array TS features:

gcc/testsuite/g++.dg/cpp1y/feat-cxx14.C

@@ -175,9 +175,10 @@
 #  error "__cpp_digit_separators != 201309"
 #endif
 
-//  Sized deallocation not in yet.
-#ifdef __cpp_sized_deallocation
+#ifndef __cpp_sized_deallocation
 #  error "__cpp_sized_deallocation"
+#elif __cpp_sized_deallocation != 201309
+#  error "__cpp_sized_deallocation != 201309"
 #endif
 
 //  GNU VLA support:

gcc/testsuite/g++.dg/cpp1y/feat-cxx98-neg.C

@@ -109,10 +109,9 @@
 #  error "__cpp_digit_separators" // { dg-error "error" }
 #endif
 
-//  Sized deallocation not in yet.
-//#ifdef __cpp_sized_deallocation
-//#  error "__cpp_sized_deallocation"
-//#endif
+#ifndef __cpp_sized_deallocation
+#  error "__cpp_sized_deallocation" // { dg-error "error" }
+#endif
 
 //  C++11 attributes:
 

gcc/testsuite/g++.dg/cpp1y/feat-sized-dealloc-neg.C

+// { dg-do compile { target c++14 } }
+// { dg-options "-fno-sized-deallocation" }
+
+#ifndef __cpp_sized_deallocation
+#  error "__cpp_sized_deallocation" // { dg-error "error" }
+#endif

gcc/testsuite/g++.dg/cpp1y/feat-sized-dealloc.C

+// { dg-do compile { target c++11_only } }
+// { dg-options "-fsized-deallocation" }
+
+// C++14 features:
+
+#ifndef __cpp_sized_deallocation
+#  error "__cpp_sized_deallocation"
+#elif __cpp_sized_deallocation != 201309
+#  error "__cpp_sized_deallocation != 201309"
+#endif