c-cppbuiltin.c (c_cpp_builtins): Define __cpp_aggregate_bases and __cpp_deduction_guides.

	* c-cppbuiltin.c (c_cpp_builtins): Define __cpp_aggregate_bases
	and __cpp_deduction_guides.

From-SVN: r241188

gcc/c-family/ChangeLog

+2016-10-14  Jason Merrill  <jason@redhat.com>
+
+	* c-cppbuiltin.c (c_cpp_builtins): Define __cpp_aggregate_bases
+	and __cpp_deduction_guides.
+
 2016-10-13  Jason Merrill  <jason@redhat.com>
 
 	* c-cppbuiltin.c (c_cpp_builtins): Add __cpp_inline_variables.

gcc/c-family/c-cppbuiltin.c

@@ -936,6 +936,8 @@ c_cpp_builtins (cpp_reader *pfile)
 	  cpp_define (pfile, "__cpp_if_constexpr=201606");
 	  cpp_define (pfile, "__cpp_capture_star_this=201603");
 	  cpp_define (pfile, "__cpp_inline_variables=201606");
+	  cpp_define (pfile, "__cpp_aggregate_bases=201603");
+	  cpp_define (pfile, "__cpp_deduction_guides=201606");
 	}
       if (flag_concepts)
 	/* Use a value smaller than the 201507 specified in

gcc/testsuite/g++.dg/cpp1z/feat-cxx1z.C

@@ -344,6 +344,18 @@
 #  error "__cpp_hex_float != 201603"
 #endif
 
+#ifndef __cpp_aggregate_bases
+#  error "__cpp_aggregate_bases"
+#elif __cpp_aggregate_bases != 201603
+#  error "__cpp_aggregate_bases != 201603"
+#endif
+
+#ifndef __cpp_deduction_guides
+#  error "__cpp_deduction_guides"
+#elif __cpp_deduction_guides != 201606
+#  error "__cpp_deduction_guides != 201606"
+#endif
+
 #ifndef __cpp_if_constexpr
 #  error "__cpp_if_constexpr"
 #elif __cpp_if_constexpr != 201606