diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/defaulted31.C | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6b5258e..e15b176 100644 --- 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 830b3f5..59abd15 100644 --- 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 17bff0e..cb950cd 100644 --- 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 2ac28ba..9473644 100644 --- 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" } |