decl.c (grokfndecl): Change pair of errors to error + inform.

/cp
2016-06-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (grokfndecl): Change pair of errors to error + inform.

/testsuite
2016-06-17  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/defaulted31.C: Adjust for dg-message vs dg-error.

From-SVN: r237562

gcc/cp/ChangeLog

+2016-06-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* decl.c (grokfndecl): Change pair of errors to error + inform.
+
 2016-06-17  Jason Merrill  <jason@redhat.com>
 
 	PR c++/71209

gcc/cp/decl.c

@@ -8295,7 +8295,8 @@ grokfndecl (tree ctype,
 	  else if (DECL_DEFAULTED_FN (old_decl))
 	    {
 	      error ("definition of explicitly-defaulted %q+D", decl);
-	      error ("%q+#D explicitly defaulted here", old_decl);
+	      inform (DECL_SOURCE_LOCATION (old_decl),
+		      "%q#D explicitly defaulted here", old_decl);
 	      return NULL_TREE;
 	    }
 

gcc/testsuite/ChangeLog

+2016-06-17  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	* g++.dg/cpp0x/defaulted31.C: Adjust for dg-message vs dg-error.
+
 2016-06-17  Christophe Lyon  <christophe.lyon@linaro.org>
 
 	* lib/target-supports.exp

gcc/testsuite/g++.dg/cpp0x/defaulted31.C

@@ -4,7 +4,7 @@
 struct A
 {
   A() { }			// { dg-message "defined" }
-  ~A() = default;		// { dg-error "defaulted" }
+  ~A() = default;		// { dg-message "defaulted" }
 };
 
 A::A() = default;		// { dg-error "redefinition" }