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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6b5258efa9f31b750e3020c886ead57e21c58e5c..e15b1760f8eb4180225ad7631505cdaf2916baac 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 830b3f523dc617708cec96eb7245bf2e44bb17cc..59abd15cf29e44e89cf3ce2df3fa31a2e4518408 100644 (file)
--- a/gcc/cp/decl.c
+++ b/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;
            }
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 17bff0ec7c18b5578832e800a8adb1f9e72faa7f..cb950cd5c5fd79bc79b460b2899dc51466e921d5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+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

diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted31.C b/gcc/testsuite/g++.dg/cpp0x/defaulted31.C
index 2ac28baf9020adf9ec7d466304ee8452a7d84390..947364440d125f4e1e68f24479fc50b28c1e997d 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted31.C
+++ b/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" }