summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/call.c18
-rw-r--r--gcc/testsuite/ChangeLog129
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/alias-decl-22.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/decltype-call1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/defaulted21.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/defaulted28.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/defaulted47.C4
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/elision_neg.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/fntmpdefarg3.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/implicit1.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/implicit9.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/inh-ctor9.C2
-rw-r--r--gcc/testsuite/g++.dg/cpp0x/range-for13.C6
-rw-r--r--gcc/testsuite/g++.dg/gomp/clause-2.C6
-rw-r--r--gcc/testsuite/g++.dg/gomp/udr-5.C4
-rw-r--r--gcc/testsuite/g++.dg/inherit/access6.C4
-rw-r--r--gcc/testsuite/g++.dg/lookup/duperr1.C2
-rw-r--r--gcc/testsuite/g++.dg/lookup/friend2.C2
-rw-r--r--gcc/testsuite/g++.dg/lookup/pr6936.C2
-rw-r--r--gcc/testsuite/g++.dg/lookup/scoped1.C2
-rw-r--r--gcc/testsuite/g++.dg/lookup/using26.C2
-rw-r--r--gcc/testsuite/g++.dg/lookup/using38.C2
-rw-r--r--gcc/testsuite/g++.dg/other/access2.C2
-rw-r--r--gcc/testsuite/g++.dg/overload/defarg3.C2
-rw-r--r--gcc/testsuite/g++.dg/overload/defarg6.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access11.C14
-rw-r--r--gcc/testsuite/g++.dg/parse/access2.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access3.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access4.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access5.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access6.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access8.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/access9.C2
-rw-r--r--gcc/testsuite/g++.dg/parse/crash40.C4
-rw-r--r--gcc/testsuite/g++.dg/tc1/dr142.C6
-rw-r--r--gcc/testsuite/g++.dg/tc1/dr166.C6
-rw-r--r--gcc/testsuite/g++.dg/tc1/dr52.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access11.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access18.C6
-rw-r--r--gcc/testsuite/g++.dg/template/access19.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access2.C4
-rw-r--r--gcc/testsuite/g++.dg/template/access20.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access26.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access3.C2
-rw-r--r--gcc/testsuite/g++.dg/template/access7.C2
-rw-r--r--gcc/testsuite/g++.dg/template/conv12.C2
-rw-r--r--gcc/testsuite/g++.dg/template/crash69.C2
-rw-r--r--gcc/testsuite/g++.dg/template/friend31.C2
-rw-r--r--gcc/testsuite/g++.dg/template/friend32.C2
-rw-r--r--gcc/testsuite/g++.dg/template/memfriend15.C2
-rw-r--r--gcc/testsuite/g++.dg/template/memfriend16.C2
-rw-r--r--gcc/testsuite/g++.dg/template/memfriend17.C2
-rw-r--r--gcc/testsuite/g++.dg/template/memfriend7.C2
-rw-r--r--gcc/testsuite/g++.dg/template/pr32519.C2
-rw-r--r--gcc/testsuite/g++.dg/template/qualttp21.C2
-rw-r--r--gcc/testsuite/g++.dg/template/qualttp8.C2
-rw-r--r--gcc/testsuite/g++.dg/template/ttp10.C4
-rw-r--r--gcc/testsuite/g++.dg/template/typedef11.C4
-rw-r--r--gcc/testsuite/g++.dg/template/typedef13.C2
-rw-r--r--gcc/testsuite/g++.dg/template/typedef19.C2
-rw-r--r--gcc/testsuite/g++.dg/template/typedef20.C2
-rw-r--r--gcc/testsuite/g++.dg/template/typedef22.C2
-rw-r--r--gcc/testsuite/g++.dg/template/using16.C2
-rw-r--r--gcc/testsuite/g++.dg/template/virtual3.C2
-rw-r--r--gcc/testsuite/g++.dg/ubsan/pr61272.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.bob/inherit2.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/crash11.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/enum6.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility1.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility10.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility2.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility6.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility7.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility8.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.brendan/visibility9.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.bugs/900428_03.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/access17.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/access18.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/access22.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/access23.C16
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/access8.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/delete3.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.jason/report.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/access2.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/access3.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/access4.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/access5.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/arm12.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/arm14.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/ctors13.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/union2.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility12.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility15.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility16.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility17.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility18.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility19.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility20.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility21.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility24.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility4.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility5.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility6.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility7.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility8.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.law/visibility9.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.niklas/t135.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.oliva/delete1.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.oliva/partord1.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/access11.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/access4.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/access7.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/crash1.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/crash7.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/friend1.C10
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/friend4.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/friend9.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/lineno1.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.other/using1.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/enum14.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/friend11.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/friend21.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/friend3.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/inherit2.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/memtemp74.C4
-rw-r--r--gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C2
-rw-r--r--gcc/testsuite/g++.old-deja/g++.robertl/eb94.C2
129 files changed, 318 insertions, 175 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 15a1b8baf05..0302516186e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-15 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * call.c (enforce_access): Emit error + inform.
+
2015-04-15 Marek Polacek <polacek@redhat.com>
* constexpr.c (use_new_call): Remove #define.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 31d2b9c2c9e..c9ecc16e400 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6020,12 +6020,22 @@ enforce_access (tree basetype_path, tree decl, tree diag_decl,
if (complain & tf_error)
{
if (TREE_PRIVATE (decl))
- error ("%q+#D is private", diag_decl);
+ {
+ error ("%q#D is private within this context", diag_decl);
+ inform (DECL_SOURCE_LOCATION (diag_decl),
+ "declared private here");
+ }
else if (TREE_PROTECTED (decl))
- error ("%q+#D is protected", diag_decl);
+ {
+ error ("%q#D is protected within this context", diag_decl);
+ inform (DECL_SOURCE_LOCATION (diag_decl),
+ "declared protected here");
+ }
else
- error ("%q+#D is inaccessible", diag_decl);
- error ("within this context");
+ {
+ error ("%q#D is inaccessible within this context", diag_decl);
+ inform (DECL_SOURCE_LOCATION (diag_decl), "declared here");
+ }
}
return false;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1df85887f66..0912b4b571b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,132 @@
+2015-04-15 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * g++.dg/cpp0x/alias-decl-22.C: Adjust for error + inform change.
+ * g++.dg/cpp0x/decltype-call1.C: Likewise.
+ * g++.dg/cpp0x/defaulted21.C: Likewise.
+ * g++.dg/cpp0x/defaulted28.C: Likewise.
+ * g++.dg/cpp0x/defaulted47.C: Likewise.
+ * g++.dg/cpp0x/elision_neg.C: Likewise.
+ * g++.dg/cpp0x/fntmpdefarg3.C: Likewise.
+ * g++.dg/cpp0x/implicit-trivial1.C: Likewise.
+ * g++.dg/cpp0x/implicit1.C: Likewise.
+ * g++.dg/cpp0x/implicit9.C: Likewise.
+ * g++.dg/cpp0x/inh-ctor9.C: Likewise.
+ * g++.dg/cpp0x/range-for13.C: Likewise.
+ * g++.dg/gomp/clause-2.C: Likewise.
+ * g++.dg/gomp/udr-5.C: Likewise.
+ * g++.dg/inherit/access6.C: Likewise.
+ * g++.dg/lookup/duperr1.C: Likewise.
+ * g++.dg/lookup/friend2.C: Likewise.
+ * g++.dg/lookup/pr6936.C: Likewise.
+ * g++.dg/lookup/scoped1.C: Likewise.
+ * g++.dg/lookup/using26.C: Likewise.
+ * g++.dg/lookup/using38.C: Likewise.
+ * g++.dg/other/access2.C: Likewise.
+ * g++.dg/overload/defarg3.C: Likewise.
+ * g++.dg/overload/defarg6.C: Likewise.
+ * g++.dg/parse/access11.C: Likewise.
+ * g++.dg/parse/access2.C: Likewise.
+ * g++.dg/parse/access3.C: Likewise.
+ * g++.dg/parse/access4.C: Likewise.
+ * g++.dg/parse/access5.C: Likewise.
+ * g++.dg/parse/access6.C: Likewise.
+ * g++.dg/parse/access8.C: Likewise.
+ * g++.dg/parse/access9.C: Likewise.
+ * g++.dg/parse/crash40.C: Likewise.
+ * g++.dg/tc1/dr142.C: Likewise.
+ * g++.dg/tc1/dr166.C: Likewise.
+ * g++.dg/tc1/dr52.C: Likewise.
+ * g++.dg/template/access11.C: Likewise.
+ * g++.dg/template/access18.C: Likewise.
+ * g++.dg/template/access19.C: Likewise.
+ * g++.dg/template/access2.C: Likewise.
+ * g++.dg/template/access20.C: Likewise.
+ * g++.dg/template/access26.C: Likewise.
+ * g++.dg/template/access3.C: Likewise.
+ * g++.dg/template/access7.C: Likewise.
+ * g++.dg/template/conv12.C: Likewise.
+ * g++.dg/template/crash69.C: Likewise.
+ * g++.dg/template/friend31.C: Likewise.
+ * g++.dg/template/friend32.C: Likewise.
+ * g++.dg/template/memfriend15.C: Likewise.
+ * g++.dg/template/memfriend16.C: Likewise.
+ * g++.dg/template/memfriend17.C: Likewise.
+ * g++.dg/template/memfriend7.C: Likewise.
+ * g++.dg/template/pr32519.C: Likewise.
+ * g++.dg/template/qualttp21.C: Likewise.
+ * g++.dg/template/qualttp8.C: Likewise.
+ * g++.dg/template/ttp10.C: Likewise.
+ * g++.dg/template/typedef11.C: Likewise.
+ * g++.dg/template/typedef13.C: Likewise.
+ * g++.dg/template/typedef19.C: Likewise.
+ * g++.dg/template/typedef20.C: Likewise.
+ * g++.dg/template/typedef22.C: Likewise.
+ * g++.dg/template/using16.C: Likewise.
+ * g++.dg/template/virtual3.C: Likewise.
+ * g++.dg/ubsan/pr61272.C: Likewise.
+ * g++.old-deja/g++.bob/inherit2.C: Likewise.
+ * g++.old-deja/g++.brendan/crash11.C: Likewise.
+ * g++.old-deja/g++.brendan/enum6.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility1.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility10.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility2.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility6.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility7.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility8.C: Likewise.
+ * g++.old-deja/g++.brendan/visibility9.C: Likewise.
+ * g++.old-deja/g++.bugs/900428_03.C: Likewise.
+ * g++.old-deja/g++.jason/access17.C: Likewise.
+ * g++.old-deja/g++.jason/access18.C: Likewise.
+ * g++.old-deja/g++.jason/access22.C: Likewise.
+ * g++.old-deja/g++.jason/access23.C: Likewise.
+ * g++.old-deja/g++.jason/access8.C: Likewise.
+ * g++.old-deja/g++.jason/delete3.C: Likewise.
+ * g++.old-deja/g++.jason/report.C: Likewise.
+ * g++.old-deja/g++.law/access2.C: Likewise.
+ * g++.old-deja/g++.law/access3.C: Likewise.
+ * g++.old-deja/g++.law/access4.C: Likewise.
+ * g++.old-deja/g++.law/access5.C: Likewise.
+ * g++.old-deja/g++.law/arm12.C: Likewise.
+ * g++.old-deja/g++.law/arm14.C: Likewise.
+ * g++.old-deja/g++.law/ctors13.C: Likewise.
+ * g++.old-deja/g++.law/union2.C: Likewise.
+ * g++.old-deja/g++.law/visibility12.C: Likewise.
+ * g++.old-deja/g++.law/visibility15.C: Likewise.
+ * g++.old-deja/g++.law/visibility16.C: Likewise.
+ * g++.old-deja/g++.law/visibility17.C: Likewise.
+ * g++.old-deja/g++.law/visibility18.C: Likewise.
+ * g++.old-deja/g++.law/visibility19.C: Likewise.
+ * g++.old-deja/g++.law/visibility20.C: Likewise.
+ * g++.old-deja/g++.law/visibility21.C: Likewise.
+ * g++.old-deja/g++.law/visibility24.C: Likewise.
+ * g++.old-deja/g++.law/visibility4.C: Likewise.
+ * g++.old-deja/g++.law/visibility5.C: Likewise.
+ * g++.old-deja/g++.law/visibility6.C: Likewise.
+ * g++.old-deja/g++.law/visibility7.C: Likewise.
+ * g++.old-deja/g++.law/visibility8.C: Likewise.
+ * g++.old-deja/g++.law/visibility9.C: Likewise.
+ * g++.old-deja/g++.niklas/t135.C: Likewise.
+ * g++.old-deja/g++.oliva/delete1.C: Likewise.
+ * g++.old-deja/g++.oliva/partord1.C: Likewise.
+ * g++.old-deja/g++.other/access11.C: Likewise.
+ * g++.old-deja/g++.other/access4.C: Likewise.
+ * g++.old-deja/g++.other/access7.C: Likewise.
+ * g++.old-deja/g++.other/crash1.C: Likewise.
+ * g++.old-deja/g++.other/crash7.C: Likewise.
+ * g++.old-deja/g++.other/friend1.C: Likewise.
+ * g++.old-deja/g++.other/friend4.C: Likewise.
+ * g++.old-deja/g++.other/friend9.C: Likewise.
+ * g++.old-deja/g++.other/lineno1.C: Likewise.
+ * g++.old-deja/g++.other/using1.C: Likewise.
+ * g++.old-deja/g++.pt/enum14.C: Likewise.
+ * g++.old-deja/g++.pt/friend11.C: Likewise.
+ * g++.old-deja/g++.pt/friend21.C: Likewise.
+ * g++.old-deja/g++.pt/friend3.C: Likewise.
+ * g++.old-deja/g++.pt/inherit2.C: Likewise.
+ * g++.old-deja/g++.pt/memtemp74.C: Likewise.
+ * g++.old-deja/g++.pt/memtemp89.C: Likewise.
+ * g++.old-deja/g++.robertl/eb94.C: Likewise.
+
2015-04-15 Jakub Jelinek <jakub@redhat.com>
PR ipa/65765
diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-22.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-22.C
index 1f6cb8f40b8..c25ee17278e 100644
--- a/gcc/testsuite/g++.dg/cpp0x/alias-decl-22.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-22.C
@@ -7,6 +7,6 @@ using foo = typename T::bar; // { dg-error "this context" }
class B
{
- typedef int bar; // { dg-error "private" }
+ typedef int bar; // { dg-message "private" }
foo<B> f; // { dg-message "required" }
};
diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype-call1.C b/gcc/testsuite/g++.dg/cpp0x/decltype-call1.C
index 39069ba228f..ebdcc840cc3 100644
--- a/gcc/testsuite/g++.dg/cpp0x/decltype-call1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/decltype-call1.C
@@ -17,7 +17,7 @@ decltype(45,f(),42) g4b(); // { dg-error "" }
class B
{
- ~B(); // { dg-error "private" }
+ ~B(); // { dg-message "private" }
public:
int i;
void operator[](int);
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted21.C b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
index 63c98e67657..312194d9876 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted21.C
@@ -4,7 +4,7 @@
struct U {
U();
private:
- U(U const&); // { dg-error "private" }
+ U(U const&); // { dg-message "private" }
};
struct X {
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
index aa900998d2f..451a1b4198f 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
@@ -6,7 +6,7 @@ struct A {
A() = default;
private:
- A(A const&) = default; // { dg-error "private" }
+ A(A const&) = default; // { dg-message "private" }
};
int f(...) { }
diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted47.C b/gcc/testsuite/g++.dg/cpp0x/defaulted47.C
index f4b62a3c659..c4f445b9e1c 100644
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted47.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted47.C
@@ -3,14 +3,14 @@
class A
{
- A() = default; // { dg-error "private" }
+ A() = default; // { dg-message "private" }
};
A a; // { dg-error "context" }
class B
{
- ~B() = default; // { dg-error "private" }
+ ~B() = default; // { dg-message "private" }
};
B b; // { dg-error "context" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/elision_neg.C b/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
index 0870a80930c..4995acd50a5 100644
--- a/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
+++ b/gcc/testsuite/g++.dg/cpp0x/elision_neg.C
@@ -12,7 +12,7 @@ struct two {char x[2];};
class move_only
{
- move_only(const move_only&); // { dg-error "is private" }
+ move_only(const move_only&); // { dg-message "private" }
move_only& operator=(const move_only&);
public:
move_only() {}
diff --git a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg3.C b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg3.C
index 8e9b76fe0e1..43affd12775 100644
--- a/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg3.C
+++ b/gcc/testsuite/g++.dg/cpp0x/fntmpdefarg3.C
@@ -8,7 +8,7 @@ template <class T, class = typename T::I> void j(T) {} // { dg-error "this conte
class A
{
- typedef int I; // { dg-error "private" }
+ typedef int I; // { dg-message "private" }
template <class T, class> friend void f(T);
friend void g<A,I>(A);
friend void h<A>(A);
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
index 23921c70386..e3491e07acd 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit-trivial1.C
@@ -8,7 +8,7 @@ struct A
{
A() {}
private:
- template <class T> A(T&); // { dg-error "private" }
+ template <class T> A(T&); // { dg-message "private" }
};
struct B // { dg-error "implicitly deleted|this context" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit1.C b/gcc/testsuite/g++.dg/cpp0x/implicit1.C
index 7eb3371798a..e784ee4e2da 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit1.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit1.C
@@ -5,7 +5,7 @@
class C
{
- void operator delete (void *); // { dg-error "private" }
+ void operator delete (void *); // { dg-message "private" }
public:
virtual ~C(); // { dg-error "overriding" }
};
diff --git a/gcc/testsuite/g++.dg/cpp0x/implicit9.C b/gcc/testsuite/g++.dg/cpp0x/implicit9.C
index 0952a420882..e1f989c6542 100644
--- a/gcc/testsuite/g++.dg/cpp0x/implicit9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/implicit9.C
@@ -5,7 +5,7 @@ struct A
{
A();
private:
- ~A(); // { dg-error "private" }
+ ~A(); // { dg-message "private" }
};
struct B: A { }; // { dg-error "implicitly deleted|context" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor9.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor9.C
index 39751013bf3..676605db9e9 100644
--- a/gcc/testsuite/g++.dg/cpp0x/inh-ctor9.C
+++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor9.C
@@ -9,7 +9,7 @@ protected:
struct B: A
{
- using A::A; // { dg-error "protected" }
+ using A::A; // { dg-message "protected" }
};
B b(42); // { dg-error "this context" }
diff --git a/gcc/testsuite/g++.dg/cpp0x/range-for13.C b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
index ab7bdde478e..100f531f760 100644
--- a/gcc/testsuite/g++.dg/cpp0x/range-for13.C
+++ b/gcc/testsuite/g++.dg/cpp0x/range-for13.C
@@ -28,8 +28,8 @@ struct container2
struct container3
{
private:
- int *begin(); // { dg-error "is private" }
- int *end(); // { dg-error "is private" }
+ int *begin(); // { dg-message "private" }
+ int *end(); // { dg-message "private" }
};
struct container4
@@ -70,7 +70,7 @@ struct container8
struct private_callable
{
private:
- int *operator()(); // { dg-error "is private" }
+ int *operator()(); // { dg-message "private" }
};
struct container9
diff --git a/gcc/testsuite/g++.dg/gomp/clause-2.C b/gcc/testsuite/g++.dg/gomp/clause-2.C
index 450419ad6cd..e9405ff7e3a 100644
--- a/gcc/testsuite/g++.dg/gomp/clause-2.C
+++ b/gcc/testsuite/g++.dg/gomp/clause-2.C
@@ -5,9 +5,9 @@ struct B { B(); };
struct C { C(); C(const C&); };
struct D { D& operator=(const D&); };
-class E { private: E(); public: E(int); }; // { dg-error "private" }
-class F { private: F(const F&); public: F(); }; // { dg-error "private" }
-class G { private: G& operator=(const G&); }; // { dg-error "private" }
+class E { private: E(); public: E(int); }; // { dg-message "private" }
+class F { private: F(const F&); public: F(); }; // { dg-message "private" }
+class G { private: G& operator=(const G&); }; // { dg-message "private" }
void bar();
void foo()
diff --git a/gcc/testsuite/g++.dg/gomp/udr-5.C b/gcc/testsuite/g++.dg/gomp/udr-5.C
index 425f8e95cd9..e20afd6f810 100644
--- a/gcc/testsuite/g++.dg/gomp/udr-5.C
+++ b/gcc/testsuite/g++.dg/gomp/udr-5.C
@@ -5,9 +5,9 @@ struct S
int s;
S () : s (0) {}
private:
- #pragma omp declare reduction (+:S:omp_out.s += omp_in.s) // { dg-error "is private" }
+ #pragma omp declare reduction (+:S:omp_out.s += omp_in.s) // { dg-message "private" }
protected:
- #pragma omp declare reduction (-:S:omp_out.s += omp_in.s) // { dg-error "is protected" }
+ #pragma omp declare reduction (-:S:omp_out.s += omp_in.s) // { dg-message "protected" }
};
struct T : public S
diff --git a/gcc/testsuite/g++.dg/inherit/access6.C b/gcc/testsuite/g++.dg/inherit/access6.C
index 7645c2d5e0d..50786ed6a34 100644
--- a/gcc/testsuite/g++.dg/inherit/access6.C
+++ b/gcc/testsuite/g++.dg/inherit/access6.C
@@ -1,9 +1,9 @@
// PR c++/28588
class Foo {
- static void f(); // { dg-error "private" }
+ static void f(); // { dg-message "private" }
static void f(int);
- static void g(); // { dg-error "private" }
+ static void g(); // { dg-message "private" }
};
void h()
diff --git a/gcc/testsuite/g++.dg/lookup/duperr1.C b/gcc/testsuite/g++.dg/lookup/duperr1.C
index cfb348d49cd..c50e9f642b9 100644
--- a/gcc/testsuite/g++.dg/lookup/duperr1.C
+++ b/gcc/testsuite/g++.dg/lookup/duperr1.C
@@ -1,5 +1,5 @@
// PR c++/29048
class A { int i; }; // { dg-bogus "is private.*is private" }
-// { dg-error "is private" "" { target *-*-* } 3 }
+// { dg-message "private" "" { target *-*-* } 3 }
class B:public A { B() { A::i=0; } }; // { dg-error "within this context" }
diff --git a/gcc/testsuite/g++.dg/lookup/friend2.C b/gcc/testsuite/g++.dg/lookup/friend2.C
index 765c69b67eb..1f07f263fef 100644
--- a/gcc/testsuite/g++.dg/lookup/friend2.C
+++ b/gcc/testsuite/g++.dg/lookup/friend2.C
@@ -12,7 +12,7 @@ struct S {
namespace NS {
class X {
friend class S;
- static int *i; // { dg-error "private" }
+ static int *i; // { dg-message "private" }
};
}
diff --git a/gcc/testsuite/g++.dg/lookup/pr6936.C b/gcc/testsuite/g++.dg/lookup/pr6936.C
index 377fbcce1e3..7139ee18e6d 100644
--- a/gcc/testsuite/g++.dg/lookup/pr6936.C
+++ b/gcc/testsuite/g++.dg/lookup/pr6936.C
@@ -3,7 +3,7 @@
struct Baser
{
- enum { j, i }; // { dg-error "inaccessible" }
+ enum { j, i }; // { dg-message "declared" }
};
struct Base : Baser
diff --git a/gcc/testsuite/g++.dg/lookup/scoped1.C b/gcc/testsuite/g++.dg/lookup/scoped1.C
index f1d3f403ea2..a0773cff6ca 100644
--- a/gcc/testsuite/g++.dg/lookup/scoped1.C
+++ b/gcc/testsuite/g++.dg/lookup/scoped1.C
@@ -4,7 +4,7 @@
struct A
{
static int i1;
- int i2; // { dg-error "inaccessible" "" }
+ int i2; // { dg-message "declared" "" }
static void f1 ();
void f2 ();
};
diff --git a/gcc/testsuite/g++.dg/lookup/using26.C b/gcc/testsuite/g++.dg/lookup/using26.C
index 141d14581c1..857c1348181 100644
--- a/gcc/testsuite/g++.dg/lookup/using26.C
+++ b/gcc/testsuite/g++.dg/lookup/using26.C
@@ -9,7 +9,7 @@ struct A
struct B
{
private:
- int next; // { dg-error "private" }
+ int next; // { dg-message "private" }
};
struct C
diff --git a/gcc/testsuite/g++.dg/lookup/using38.C b/gcc/testsuite/g++.dg/lookup/using38.C
index 377fbcce1e3..7139ee18e6d 100644
--- a/gcc/testsuite/g++.dg/lookup/using38.C
+++ b/gcc/testsuite/g++.dg/lookup/using38.C
@@ -3,7 +3,7 @@
struct Baser
{
- enum { j, i }; // { dg-error "inaccessible" }
+ enum { j, i }; // { dg-message "declared" }
};
struct Base : Baser
diff --git a/gcc/testsuite/g++.dg/other/access2.C b/gcc/testsuite/g++.dg/other/access2.C
index c7dd77a043a..634fab3fe31 100644
--- a/gcc/testsuite/g++.dg/other/access2.C
+++ b/gcc/testsuite/g++.dg/other/access2.C
@@ -18,7 +18,7 @@ public:
void test();
};
-int Base::fooprivate=42; // { dg-error "private" }
+int Base::fooprivate=42; // { dg-message "private" }
int Base::fooprotected=42;
int Base::foopublic=42;
diff --git a/gcc/testsuite/g++.dg/overload/defarg3.C b/gcc/testsuite/g++.dg/overload/defarg3.C
index 6622e430a61..d6819021ba2 100644
--- a/gcc/testsuite/g++.dg/overload/defarg3.C
+++ b/gcc/testsuite/g++.dg/overload/defarg3.C
@@ -3,7 +3,7 @@
class C {
private:
- static int f(int); // { dg-error "private" }
+ static int f(int); // { dg-message "private" }
static int f(char);
};
diff --git a/gcc/testsuite/g++.dg/overload/defarg6.C b/gcc/testsuite/g++.dg/overload/defarg6.C
index b750184c376..c5473aec307 100644
--- a/gcc/testsuite/g++.dg/overload/defarg6.C
+++ b/gcc/testsuite/g++.dg/overload/defarg6.C
@@ -1,7 +1,7 @@
class A
{
int i;
- A(int i): i(i) {} // { dg-error "private" }
+ A(int i): i(i) {} // { dg-message "private" }
};
void f (A = 1) { } // { dg-error "context" }
diff --git a/gcc/testsuite/g++.dg/parse/access11.C b/gcc/testsuite/g++.dg/parse/access11.C
index 7004fa76401..372d2aaea41 100644
--- a/gcc/testsuite/g++.dg/parse/access11.C
+++ b/gcc/testsuite/g++.dg/parse/access11.C
@@ -2,24 +2,24 @@
class A {
union {
- int i; // { dg-error "private" }
+ int i; // { dg-message "private" }
};
union {
- int j; // { dg-error "private" }
+ int j; // { dg-message "private" }
};
union {
union {
- int k; // { dg-error "private" }
+ int k; // { dg-message "private" }
};
union {
union {
- int l; // { dg-error "private" }
+ int l; // { dg-message "private" }
};
union {
- int m; // { dg-error "private" }
+ int m; // { dg-message "private" }
union {
- int n; // { dg-error "private" }
- int o; // { dg-error "private" }
+ int n; // { dg-message "private" }
+ int o; // { dg-message "private" }
};
};
};
diff --git a/gcc/testsuite/g++.dg/parse/access2.C b/gcc/testsuite/g++.dg/parse/access2.C
index ee8cd234e07..6b8bccc603d 100644
--- a/gcc/testsuite/g++.dg/parse/access2.C
+++ b/gcc/testsuite/g++.dg/parse/access2.C
@@ -5,7 +5,7 @@
// Deferred access checking of variable declaration.
class A {
- typedef int X; // { dg-error "private" }
+ typedef int X; // { dg-message "private" }
static X a, b, c;
};
diff --git a/gcc/testsuite/g++.dg/parse/access3.C b/gcc/testsuite/g++.dg/parse/access3.C
index 43303c95a94..7c8abff91b4 100644
--- a/gcc/testsuite/g++.dg/parse/access3.C
+++ b/gcc/testsuite/g++.dg/parse/access3.C
@@ -6,7 +6,7 @@
class A {
private:
- void f(); // { dg-error "private" }
+ void f(); // { dg-message "private" }
};
class B {
diff --git a/gcc/testsuite/g++.dg/parse/access4.C b/gcc/testsuite/g++.dg/parse/access4.C
index d3870bd3497..57f8a11a232 100644
--- a/gcc/testsuite/g++.dg/parse/access4.C
+++ b/gcc/testsuite/g++.dg/parse/access4.C
@@ -6,7 +6,7 @@
class A {
protected:
- void foo() {} // { dg-error "protected" }
+ void foo() {} // { dg-message "protected" }
public:
A();
};
diff --git a/gcc/testsuite/g++.dg/parse/access5.C b/gcc/testsuite/g++.dg/parse/access5.C
index cd1789eedda..5772c0d9311 100644
--- a/gcc/testsuite/g++.dg/parse/access5.C
+++ b/gcc/testsuite/g++.dg/parse/access5.C
@@ -7,7 +7,7 @@
struct A
{
protected:
- int a; // { dg-error "protected" }
+ int a; // { dg-message "protected" }
};
struct B : A
diff --git a/gcc/testsuite/g++.dg/parse/access6.C b/gcc/testsuite/g++.dg/parse/access6.C
index 33d50905854..cae5deec8f8 100644
--- a/gcc/testsuite/g++.dg/parse/access6.C
+++ b/gcc/testsuite/g++.dg/parse/access6.C
@@ -8,7 +8,7 @@
class A
{
public:
- int foo() { return 1; } // { dg-error "inaccessible" }
+ int foo() { return 1; } // { dg-message "declared" }
};
class B : public A
diff --git a/gcc/testsuite/g++.dg/parse/access8.C b/gcc/testsuite/g++.dg/parse/access8.C
index 205b7f2712a..42472def17c 100644
--- a/gcc/testsuite/g++.dg/parse/access8.C
+++ b/gcc/testsuite/g++.dg/parse/access8.C
@@ -2,7 +2,7 @@
class foo
{
- typedef int memfun; // { dg-error "private" }
+ typedef int memfun; // { dg-message "private" }
};
template<foo::memfun> // { dg-error "context" }
diff --git a/gcc/testsuite/g++.dg/parse/access9.C b/gcc/testsuite/g++.dg/parse/access9.C
index 2c29016b047..4d41e50f9ed 100644
--- a/gcc/testsuite/g++.dg/parse/access9.C
+++ b/gcc/testsuite/g++.dg/parse/access9.C
@@ -1,5 +1,5 @@
// PR c++/24782
class Foo { public: typedef int type1; };
-class Bar { private: typedef Foo type2; }; // { dg-error "private" }
+class Bar { private: typedef Foo type2; }; // { dg-message "private" }
void g(Bar::type2::type1) {} // { dg-error "context" }
diff --git a/gcc/testsuite/g++.dg/parse/crash40.C b/gcc/testsuite/g++.dg/parse/crash40.C
index 6b67d8dfe10..df352dd7db5 100644
--- a/gcc/testsuite/g++.dg/parse/crash40.C
+++ b/gcc/testsuite/g++.dg/parse/crash40.C
@@ -10,7 +10,7 @@ struct C : A {};
class AA
{
- template<int> void foo(); /* { dg-error "is private" } */
+ template<int> void foo(); /* { dg-message "private" } */
};
struct BB : AA {};
@@ -20,7 +20,7 @@ class AAA {
struct BBB {
static BBB *foo();
private:
- int get() const {} /* { dg-error "is private" } */
+ int get() const {} /* { dg-message "private" } */
};
template<bool> struct S {
S(unsigned int = BBB::foo()->AAA::get()); /* { dg-error "is not a base of" } */
diff --git a/gcc/testsuite/g++.dg/tc1/dr142.C b/gcc/testsuite/g++.dg/tc1/dr142.C
index c49f4dd20d3..25686446b26 100644
--- a/gcc/testsuite/g++.dg/tc1/dr142.C
+++ b/gcc/testsuite/g++.dg/tc1/dr142.C
@@ -2,10 +2,10 @@
// Origin: Giovanni Bajo <giovannibajo at gcc dot gnu dot org>
// DR142: Injection-related errors in access example
-class B { // { dg-error "inaccessible" }
+class B { // { dg-message "declared" }
public:
- int mi; // { dg-error "inaccessible" }
- static int si; // { dg-error "inaccessible" }
+ int mi; // { dg-message "declared" }
+ static int si; // { dg-message "declared" }
};
class D: private B {
diff --git a/gcc/testsuite/g++.dg/tc1/dr166.C b/gcc/testsuite/g++.dg/tc1/dr166.C
index 7ca275ed92d..659a818f8cd 100644
--- a/gcc/testsuite/g++.dg/tc1/dr166.C
+++ b/gcc/testsuite/g++.dg/tc1/dr166.C
@@ -9,17 +9,17 @@ namespace N {
namespace M {
class A {
friend void f<int>(int); // N::f
- static int x; // { dg-error "private" }
+ static int x; // { dg-message "private" }
};
class B {
template <class T> friend void f(T); // M::f
- static int x; // { dg-error "private" }
+ static int x; // { dg-message "private" }
};
class C {
friend void g(); // M::g
- static int x; // { dg-error "private" }
+ static int x; // { dg-message "private" }
};
template <class T> void f(T) // will be instantiated as f<long>
diff --git a/gcc/testsuite/g++.dg/tc1/dr52.C b/gcc/testsuite/g++.dg/tc1/dr52.C
index 4f4015dc958..7cff847023f 100644
--- a/gcc/testsuite/g++.dg/tc1/dr52.C
+++ b/gcc/testsuite/g++.dg/tc1/dr52.C
@@ -17,7 +17,7 @@ struct B1 : B {};
struct B2 : B {};
struct C
-{ // { dg-error "C" }
+{ // { dg-message "declared" }
void foo(void);
};
diff --git a/gcc/testsuite/g++.dg/template/access11.C b/gcc/testsuite/g++.dg/template/access11.C
index 73e2caaf03f..9414d01798b 100644
--- a/gcc/testsuite/g++.dg/template/access11.C
+++ b/gcc/testsuite/g++.dg/template/access11.C
@@ -5,7 +5,7 @@
// Access checking during explicit instantiation.
class A {
- typedef int X; // { dg-error "private" }
+ typedef int X; // { dg-message "private" }
};
class X {
diff --git a/gcc/testsuite/g++.dg/template/access18.C b/gcc/testsuite/g++.dg/template/access18.C
index 3338bc932ff..af3e0a3f0b8 100644
--- a/gcc/testsuite/g++.dg/template/access18.C
+++ b/gcc/testsuite/g++.dg/template/access18.C
@@ -1,10 +1,10 @@
// DR 401
class X {
- typedef int a; // { dg-error "private" }
- static const int b = 5; // { dg-error "private" }
+ typedef int a; // { dg-message "private" }
+ static const int b = 5; // { dg-message "private" }
template <typename>
- struct c; // { dg-error "private" }
+ struct c; // { dg-message "private" }
};
template <typename = X::a> // { dg-error "context" }
diff --git a/gcc/testsuite/g++.dg/template/access19.C b/gcc/testsuite/g++.dg/template/access19.C
index 6420b1cbed1..251048c71f4 100644
--- a/gcc/testsuite/g++.dg/template/access19.C
+++ b/gcc/testsuite/g++.dg/template/access19.C
@@ -9,7 +9,7 @@ public:
operator T&() { return value; }
private:
template< class U >
- explicit_t( U t ); /* { dg-error "with U = char, T = int|is private" } */
+ explicit_t( U t ); /* { dg-message "with U = char, T = int|private" } */
T value;
};
diff --git a/gcc/testsuite/g++.dg/template/access2.C b/gcc/testsuite/g++.dg/template/access2.C
index 0b4657d1a8a..0620c10f79d 100644
--- a/gcc/testsuite/g++.dg/template/access2.C
+++ b/gcc/testsuite/g++.dg/template/access2.C
@@ -9,8 +9,8 @@ template <class T> struct A {
};
class B {
- typedef int X; // { dg-error "private" }
- static int i; // { dg-error "private" }
+ typedef int X; // { dg-message "private" }
+ static int i; // { dg-message "private" }
};
int main()
diff --git a/gcc/testsuite/g++.dg/template/access20.C b/gcc/testsuite/g++.dg/template/access20.C
index ebf575e6c30..8065615bcb8 100644
--- a/gcc/testsuite/g++.dg/template/access20.C
+++ b/gcc/testsuite/g++.dg/template/access20.C
@@ -3,7 +3,7 @@
template <typename T> struct B
{
protected:
- T v; // { dg-error "protected" }
+ T v; // { dg-message "protected" }
};
template <typename T> struct D : B<T>
{
diff --git a/gcc/testsuite/g++.dg/template/access26.C b/gcc/testsuite/g++.dg/template/access26.C
index 1c5de9a8fd2..b17baa71cab 100644
--- a/gcc/testsuite/g++.dg/template/access26.C
+++ b/gcc/testsuite/g++.dg/template/access26.C
@@ -2,5 +2,5 @@
template < typename T >
struct A { static int i; };
-class B { typedef int X; }; // { dg-error "private" }
+class B { typedef int X; }; // { dg-message "private" }
void f() { A<B::X>::i = 0; } // { dg-error "this context" }
diff --git a/gcc/testsuite/g++.dg/template/access3.C b/gcc/testsuite/g++.dg/template/access3.C
index ab56620772e..2b456b1901a 100644
--- a/gcc/testsuite/g++.dg/template/access3.C
+++ b/gcc/testsuite/g++.dg/template/access3.C
@@ -8,7 +8,7 @@ template <class T> struct A {
};
class B {
- template <class T> class X {}; // { dg-error "private" }
+ template <class T> class X {}; // { dg-message "private" }
};
int main()
diff --git a/gcc/testsuite/g++.dg/template/access7.C b/gcc/testsuite/g++.dg/template/access7.C
index 7d1812732c3..b477e5a10f7 100644
--- a/gcc/testsuite/g++.dg/template/access7.C
+++ b/gcc/testsuite/g++.dg/template/access7.C
@@ -5,7 +5,7 @@
template <typename A>
class S {
- class T {}; // { dg-error "private" }
+ class T {}; // { dg-message "private" }
};
template <typename A>
diff --git a/gcc/testsuite/g++.dg/template/conv12.C b/gcc/testsuite/g++.dg/template/conv12.C
index e6af05481d7..dea72d6c44b 100644
--- a/gcc/testsuite/g++.dg/template/conv12.C
+++ b/gcc/testsuite/g++.dg/template/conv12.C
@@ -16,7 +16,7 @@ struct C2
{
private:
template <class T>
- operator T(); // { dg-error "private" }
+ operator T(); // { dg-message "private" }
public:
operator bool() { return false; }
} c2;
diff --git a/gcc/testsuite/g++.dg/template/crash69.C b/gcc/testsuite/g++.dg/template/crash69.C
index 957f1e19ba3..badf70bd0e4 100644
--- a/gcc/testsuite/g++.dg/template/crash69.C
+++ b/gcc/testsuite/g++.dg/template/crash69.C
@@ -2,7 +2,7 @@
template<typename T> class A
{
- static int i; // { dg-error "is private" }
+ static int i; // { dg-message "private" }
friend int T::foo(); // { dg-error "does not match" }
};
diff --git a/gcc/testsuite/g++.dg/template/friend31.C b/gcc/testsuite/g++.dg/template/friend31.C
index 5e60540b693..2be5600810e 100644
--- a/gcc/testsuite/g++.dg/template/friend31.C
+++ b/gcc/testsuite/g++.dg/template/friend31.C
@@ -10,7 +10,7 @@ template <typename T, typename U> struct F; // { dg-message "previous declaratio
class W
{
template<int i> friend class F; // { dg-error "template parameter" }
- int x; // { dg-error "private" }
+ int x; // { dg-message "private" }
};
template <typename T, typename U> struct F
diff --git a/gcc/testsuite/g++.dg/template/friend32.C b/gcc/testsuite/g++.dg/template/friend32.C
index d5b78e05807..94bff37776f 100644
--- a/gcc/testsuite/g++.dg/template/friend32.C
+++ b/gcc/testsuite/g++.dg/template/friend32.C
@@ -7,7 +7,7 @@
template<class T> class A
{
- void f (); // { dg-error "private" }
+ void f (); // { dg-message "private" }
};
template<class T> class B
diff --git a/gcc/testsuite/g++.dg/template/memfriend15.C b/gcc/testsuite/g++.dg/template/memfriend15.C
index a620c3b15ce..f0410a96b04 100644
--- a/gcc/testsuite/g++.dg/template/memfriend15.C
+++ b/gcc/testsuite/g++.dg/template/memfriend15.C
@@ -17,7 +17,7 @@ template<class T> struct A
};
class C {
- int i; // { dg-error "private" }
+ int i; // { dg-message "private" }
template<class T> friend struct A<T>::B1;
};
diff --git a/gcc/testsuite/g++.dg/template/memfriend16.C b/gcc/testsuite/g++.dg/template/memfriend16.C
index 1276970e344..111f8c83dd1 100644
--- a/gcc/testsuite/g++.dg/template/memfriend16.C
+++ b/gcc/testsuite/g++.dg/template/memfriend16.C
@@ -17,7 +17,7 @@ template<class T> struct A
};
class C {
- int i; // { dg-error "private" }
+ int i; // { dg-message "private" }
template<class T> template <class U> friend struct A<T>::B1;
};
diff --git a/gcc/testsuite/g++.dg/template/memfriend17.C b/gcc/testsuite/g++.dg/template/memfriend17.C
index 5f4b8e7b379..f08a8d6b75f 100644
--- a/gcc/testsuite/g++.dg/template/memfriend17.C
+++ b/gcc/testsuite/g++.dg/template/memfriend17.C
@@ -18,7 +18,7 @@ template<typename Q>
class F1
{
friend class A<Q>::B;
- enum { foo = 0 }; // { dg-error "private" }
+ enum { foo = 0 }; // { dg-message "private" }
};
template<typename Q>
diff --git a/gcc/testsuite/g++.dg/template/memfriend7.C b/gcc/testsuite/g++.dg/template/memfriend7.C
index 26ca6d8e9f0..2659a1a2191 100644
--- a/gcc/testsuite/g++.dg/template/memfriend7.C
+++ b/gcc/testsuite/g++.dg/template/memfriend7.C
@@ -15,7 +15,7 @@ template <class T> struct A {
};
class C {
- int ii; // { dg-error "private" }
+ int ii; // { dg-message "private" }
template <class U> template <class V>
friend void A<U>::f(V);
template <class U> friend void A<U>::g();
diff --git a/gcc/testsuite/g++.dg/template/pr32519.C b/gcc/testsuite/g++.dg/template/pr32519.C
index e93c7b4761d..a010a5695b2 100644
--- a/gcc/testsuite/g++.dg/template/pr32519.C
+++ b/gcc/testsuite/g++.dg/template/pr32519.C
@@ -4,7 +4,7 @@
struct B
{
protected:
- template <class T> void f (); // { dg-error "protected" }
+ template <class T> void f (); // { dg-message "protected" }
};
struct D : public B
diff --git a/gcc/testsuite/g++.dg/template/qualttp21.C b/gcc/testsuite/g++.dg/template/qualttp21.C
index 00fcf40c45c..9abdf653b6d 100644
--- a/gcc/testsuite/g++.dg/template/qualttp21.C
+++ b/gcc/testsuite/g++.dg/template/qualttp21.C
@@ -8,7 +8,7 @@ class foo {
public:
foo() {}
protected:
- ~foo() {} // { dg-error "~foo" }
+ ~foo() {} // { dg-message "protected" }
};
int main()
diff --git a/gcc/testsuite/g++.dg/template/qualttp8.C b/gcc/testsuite/g++.dg/template/qualttp8.C
index c1396dbad02..40491a4c9eb 100644
--- a/gcc/testsuite/g++.dg/template/qualttp8.C
+++ b/gcc/testsuite/g++.dg/template/qualttp8.C
@@ -11,7 +11,7 @@ template <class T> struct D {
struct E {
private:
- template <class T> class B {}; // { dg-error "private" }
+ template <class T> class B {}; // { dg-message "private" }
};
D<E> d; // { dg-message "required" }
diff --git a/gcc/testsuite/g++.dg/template/ttp10.C b/gcc/testsuite/g++.dg/template/ttp10.C
index 09bdb1a8467..2aafc233036 100644
--- a/gcc/testsuite/g++.dg/template/ttp10.C
+++ b/gcc/testsuite/g++.dg/template/ttp10.C
@@ -9,8 +9,8 @@ template <typename> struct Template {};
template<template<typename> class D>
struct B {
- static void foo1(const D<void> *); // { dg-error "const" }
- static void foo2(volatile D<void> *);// { dg-error "volatile" }
+ static void foo1(const D<void> *); // { dg-message "declared" }
+ static void foo2(volatile D<void> *);// { dg-message "declared" }
};
class E : protected B<Template> {};
diff --git a/gcc/testsuite/g++.dg/template/typedef11.C b/gcc/testsuite/g++.dg/template/typedef11.C
index a08d7b3a939..a5b826a8e69 100644
--- a/gcc/testsuite/g++.dg/template/typedef11.C
+++ b/gcc/testsuite/g++.dg/template/typedef11.C
@@ -5,13 +5,13 @@
class Alpha
{
- typedef int X; // { dg-error "'typedef int Alpha::X' is private" }
+ typedef int X; // { dg-message "private" }
};
template<int>
class Beta
{
- typedef int Y; // { dg-error "'typedef int Beta<0>::Y' is private" }
+ typedef int Y; // { dg-message "private" }
};
template <int>
diff --git a/gcc/testsuite/g++.dg/template/typedef13.C b/gcc/testsuite/g++.dg/template/typedef13.C
index 5d40e63f1e2..5684f986996 100644
--- a/gcc/testsuite/g++.dg/template/typedef13.C
+++ b/gcc/testsuite/g++.dg/template/typedef13.C
@@ -4,7 +4,7 @@
class A
{
- typedef int mytype; // { dg-error "typedef int A::mytype' is private" }
+ typedef int mytype; // { dg-message "private" }
};
template <class T> class B : public A
diff --git a/gcc/testsuite/g++.dg/template/typedef19.C b/gcc/testsuite/g++.dg/template/typedef19.C
index 2fac20ea065..2547857cfff 100644
--- a/gcc/testsuite/g++.dg/template/typedef19.C
+++ b/gcc/testsuite/g++.dg/template/typedef19.C
@@ -4,7 +4,7 @@
class A
{
- typedef int mytype; // { dg-error "'typedef int A::mytype' is private" }
+ typedef int mytype; // { dg-message "private" }
};
template <class T>
diff --git a/gcc/testsuite/g++.dg/template/typedef20.C b/gcc/testsuite/g++.dg/template/typedef20.C
index c768ce0a78a..e50530092ff 100644
--- a/gcc/testsuite/g++.dg/template/typedef20.C
+++ b/gcc/testsuite/g++.dg/template/typedef20.C
@@ -4,7 +4,7 @@
class x
{
- typedef int privtype; // { dg-error "is private" }
+ typedef int privtype; // { dg-message "private" }
protected:
typedef int type;
diff --git a/gcc/testsuite/g++.dg/template/typedef22.C b/gcc/testsuite/g++.dg/template/typedef22.C
index e3ecfcb3673..97d7e8b3605 100644
--- a/gcc/testsuite/g++.dg/template/typedef22.C
+++ b/gcc/testsuite/g++.dg/template/typedef22.C
@@ -6,7 +6,7 @@ template <typename T>
struct B
{
protected:
- typedef int M; // { dg-error "protected" }
+ typedef int M; // { dg-message "protected" }
};
template <typename T>
diff --git a/gcc/testsuite/g++.dg/template/using16.C b/gcc/testsuite/g++.dg/template/using16.C
index 589f7f18f52..96ef8204d4f 100644
--- a/gcc/testsuite/g++.dg/template/using16.C
+++ b/gcc/testsuite/g++.dg/template/using16.C
@@ -11,7 +11,7 @@ struct B
{
class type
{
- type(); // { dg-error "private" }
+ type(); // { dg-message "private" }
};
};
diff --git a/gcc/testsuite/g++.dg/template/virtual3.C b/gcc/testsuite/g++.dg/template/virtual3.C
index 9fcfc455b7e..2e4adca2377 100644
--- a/gcc/testsuite/g++.dg/template/virtual3.C
+++ b/gcc/testsuite/g++.dg/template/virtual3.C
@@ -2,7 +2,7 @@
template<int> class A
{
- virtual ~A(); // { dg-error "non-deleted|private" }
+ virtual ~A(); // { dg-message "non-deleted|private" }
};
struct B : A<0>, A<1> // { dg-error "deleted|context" }
diff --git a/gcc/testsuite/g++.dg/ubsan/pr61272.C b/gcc/testsuite/g++.dg/ubsan/pr61272.C
index 064678d37b8..11dd1ecb733 100644
--- a/gcc/testsuite/g++.dg/ubsan/pr61272.C
+++ b/gcc/testsuite/g++.dg/ubsan/pr61272.C
@@ -7,7 +7,7 @@ namespace std
template < typename _Tp > class allocator;
template < typename _Alloc > struct allocator_traits {
private:
- template < typename _Tp > auto construct ( _Alloc & __a, _Tp * __p)-> // { dg-error "is private" }
+ template < typename _Tp > auto construct ( _Alloc & __a, _Tp * __p)-> // { dg-message "private" }
decltype (_S_construct (__a, __p)) { }
};
namespace __gnu_cxx
diff --git a/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C b/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
index f92e8e12047..4a6ce9f7443 100644
--- a/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
+++ b/gcc/testsuite/g++.old-deja/g++.bob/inherit2.C
@@ -6,7 +6,7 @@ public:
void z();
A(void) {}
private:
- A(const A &) { abort(); } // { dg-error "private" }
+ A(const A &) { abort(); } // { dg-message "private" }
const A& operator =(const A &) { abort(); }
};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
index eb08ca2642f..1683de2b47f 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash11.C
@@ -3,8 +3,8 @@
extern "C" int printf (const char *, ...);
class A {
- int i; // { dg-error "" } private
- int j; // { dg-error "" } private
+ int i; // { dg-message "" } private
+ int j; // { dg-message "" } private
public:
int h;
A() { i=10; j=20; }
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/enum6.C b/gcc/testsuite/g++.old-deja/g++.brendan/enum6.C
index 29908b81d11..1a863317f83 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/enum6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/enum6.C
@@ -2,7 +2,7 @@
// GROUPS passed enums
class X {
private:
- enum E1 {a1, b1}; // { dg-error "" } private
+ enum E1 {a1, b1}; // { dg-message "" } private
public:
enum E2 {a2, b2};
};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility1.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility1.C
index cb4003f0a23..17e21b815a9 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility1.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility1.C
@@ -2,7 +2,7 @@
// GROUPS passed visibility
class foo {
protected:
- int i; // { dg-error "" } protected
+ int i; // { dg-message "" } protected
};
class bar : public foo {
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility10.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility10.C
index 89d2157995a..030a4713dbc 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility10.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility10.C
@@ -3,7 +3,7 @@
struct base
{
protected:
- void base_func() {}// { dg-error "" } .*is protected.*
+ void base_func() {}// { dg-message "" } .*protected.*
};
struct derived : public base
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility2.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility2.C
index 74021d58db8..d5132665bac 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility2.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility2.C
@@ -1,7 +1,7 @@
// { dg-do assemble }
// GROUPS passed visibility
class X {
- void g (int); // { dg-error "" } private
+ void g (int); // { dg-message "" } private
public:
void g (double);
};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility6.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility6.C
index f9ba954ea79..3dfaf7fd0ea 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility6.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility6.C
@@ -3,7 +3,7 @@
class bottom
{
public:
- int b; // { dg-error "" } private
+ int b; // { dg-message "" } private
};
class middle : private bottom
{
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility7.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility7.C
index f7bf00c1a72..58886d630e4 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility7.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility7.C
@@ -3,7 +3,7 @@
class X
{
public:
- void fn ();// { dg-error "" } .*
+ void fn ();// { dg-message "" } .*
};
class Y : private X
{};
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility8.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility8.C
index 00f5347ff86..3c443afe678 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility8.C
@@ -5,7 +5,7 @@
class foo
{
public:
- static int y; // { dg-error "" } private
+ static int y; // { dg-message "" } private
};
class foo1 : private foo
{ };
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/visibility9.C b/gcc/testsuite/g++.old-deja/g++.brendan/visibility9.C
index 963bc2bafa3..4ebdc696217 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/visibility9.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/visibility9.C
@@ -2,7 +2,7 @@
// GROUPS passed visibility
class A {
public:
- void aMethod(void) {};// { dg-error "" } .*
+ void aMethod(void) {};// { dg-message "" } .*
};
class AA : A { };
diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900428_03.C b/gcc/testsuite/g++.old-deja/g++.bugs/900428_03.C
index d0625c4b473..d5fcc9df3c8 100644
--- a/gcc/testsuite/g++.old-deja/g++.bugs/900428_03.C
+++ b/gcc/testsuite/g++.old-deja/g++.bugs/900428_03.C
@@ -18,7 +18,7 @@ public:
};
struct_0::struct_0 (int i) { }
-struct_0::struct_0 (int, int) { } // { dg-error "is private" }
+struct_0::struct_0 (int, int) { } // { dg-message "private" }
struct struct_1 : public struct_0 {
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access17.C b/gcc/testsuite/g++.old-deja/g++.jason/access17.C
index ec8949d77df..e64fa1aed41 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access17.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access17.C
@@ -3,8 +3,8 @@
struct A {
protected:
- int i; // { dg-error "" } private
- int f (); // { dg-error "" }
+ int i; // { dg-message "" } private
+ int f (); // { dg-message "" }
};
struct B: public A {
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access18.C b/gcc/testsuite/g++.old-deja/g++.jason/access18.C
index 900058caba9..fcab0878e89 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access18.C
@@ -6,8 +6,8 @@
int r = 0;
class A {
private:
- A() { r = 1; } // { dg-error "" }
- ~A() {} // { dg-error "" }
+ A() { r = 1; } // { dg-message "" }
+ ~A() {} // { dg-message "" }
};
class B : public A {
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access22.C b/gcc/testsuite/g++.old-deja/g++.jason/access22.C
index efd09e52cfd..7bfbe487f9e 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access22.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access22.C
@@ -5,7 +5,7 @@
class A
{
private:
- static void foo() {} // { dg-error "" }
+ static void foo() {} // { dg-message "" }
public:
void goo() {}
};
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access23.C b/gcc/testsuite/g++.old-deja/g++.jason/access23.C
index ff2c8e8bc36..aec28197363 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access23.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access23.C
@@ -17,24 +17,24 @@ public:
int PUB_A;
protected:
union {
- long B; // { dg-error "" } protected
- void *pY; // { dg-error "" } protected
+ long B; // { dg-message "" } protected
+ void *pY; // { dg-message "" } protected
} ;
union Y {
long B;
void *pY;
- } PRT; // { dg-error "" } protected
- int PRT_A; // { dg-error "" } protected
+ } PRT; // { dg-message "" } protected
+ int PRT_A; // { dg-message "" } protected
private:
union {
- long C; // { dg-error "" } private
- void *pZ; // { dg-error "" } private
+ long C; // { dg-message "" } private
+ void *pZ; // { dg-message "" } private
};
union Z {
long C;
void *pZ;
- } PRV; // { dg-error "" } private
- int PRV_A; // { dg-error "" } private
+ } PRV; // { dg-message "" } private
+ int PRV_A; // { dg-message "" } private
};
struct Bar : public Foo {
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access8.C b/gcc/testsuite/g++.old-deja/g++.jason/access8.C
index c488ef76765..4404d8ad95d 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access8.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access8.C
@@ -3,7 +3,7 @@
// Date: 25 Jan 1994 23:41:33 -0500
// Bug: g++ forgets access decls after the definition.
-class inh { // { dg-error "" } inaccessible
+class inh { // { dg-message "" } inaccessible
int a;
protected:
void myf(int);
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/delete3.C b/gcc/testsuite/g++.old-deja/g++.jason/delete3.C
index bde62d968b4..b7d77ba1405 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/delete3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/delete3.C
@@ -6,7 +6,7 @@ public:
A();
~A();
protected:
- void operator delete(void *); // { dg-error "" } protected
+ void operator delete(void *); // { dg-message "" } protected
};
A::~A()
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/report.C b/gcc/testsuite/g++.old-deja/g++.jason/report.C
index e1079cfb0aa..d78dcc133f9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/report.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/report.C
@@ -42,7 +42,7 @@ int foo2 (int (*a)(int) = &foo)
}
class X{
- class Y{}; // { dg-error "" } private
+ class Y{}; // { dg-message "" } private
};
typedef int const * bart ();
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access2.C b/gcc/testsuite/g++.old-deja/g++.law/access2.C
index 2177748b77a..1116da1d796 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access2.C
@@ -10,7 +10,7 @@ template <class T> class Foo
{
private:
friend class Bar; // To avoid warning.
- Foo(const T &v) {}; // { dg-error "" } private
+ Foo(const T &v) {}; // { dg-message "" } private
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access3.C b/gcc/testsuite/g++.old-deja/g++.law/access3.C
index 3a6acb92227..37552c8cd07 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access3.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access3.C
@@ -7,7 +7,7 @@
// Subject: bug with access control to member functions
class X {
- void g (int); // { dg-error "" } is private
+ void g (int); // { dg-message "" } is private
public:
void g (double);
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access4.C b/gcc/testsuite/g++.old-deja/g++.law/access4.C
index 174c441d31c..54072ce3b32 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access4.C
@@ -6,9 +6,9 @@
// Subject: g++ 2.5.5 doesn't warn about inaccessible virtual base ctor
// Message-ID: <9403030024.AA04534@ses.com>
-class ForceLeafSterile { // { dg-error "" }
+class ForceLeafSterile { // { dg-message "" }
friend class Sterile;
- ForceLeafSterile() {} // { dg-error "" }
+ ForceLeafSterile() {} // { dg-message "" }
};
class Sterile : private virtual ForceLeafSterile {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/access5.C b/gcc/testsuite/g++.old-deja/g++.law/access5.C
index 80f848c1ded..f3d0226c2bf 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/access5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/access5.C
@@ -13,7 +13,7 @@ public:
protected:
class nested_protected { int x; };
private:
- class nested_private { int x; }; // { dg-error "" } private
+ class nested_private { int x; }; // { dg-message "" } private
};
class derived : public enclose {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm12.C b/gcc/testsuite/g++.old-deja/g++.law/arm12.C
index c0332d36733..866b47ada44 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm12.C
@@ -22,7 +22,7 @@ public:
Y();
};
-X::X() // { dg-error "is private" }
+X::X() // { dg-message "private" }
{
std::cout << "X::X()" << std::endl;
}
diff --git a/gcc/testsuite/g++.old-deja/g++.law/arm14.C b/gcc/testsuite/g++.old-deja/g++.law/arm14.C
index 9e51f0e3c6d..ab322b6362b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/arm14.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/arm14.C
@@ -9,7 +9,7 @@
class X {
private:
- enum E1 {a1, b1}; // { dg-error "" } private
+ enum E1 {a1, b1}; // { dg-message "" } private
public:
enum E2 {a2, b2};
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/ctors13.C b/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
index e092222c26e..82f70f35f06 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/ctors13.C
@@ -3,7 +3,7 @@
#include <iostream>
class A {
- A() {} // private constructor// { dg-error "" } .*
+ A() {} // private constructor// { dg-message "" } .*
};
int main() {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/union2.C b/gcc/testsuite/g++.old-deja/g++.law/union2.C
index 37de9eaf0ba..667ecb6b0d9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/union2.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/union2.C
@@ -10,9 +10,9 @@ class A {
public:
int x;
private:
- int y; // { dg-error "" } private
+ int y; // { dg-message "" } private
union {
- int z; // { dg-error "" } private
+ int z; // { dg-message "" } private
};
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility12.C b/gcc/testsuite/g++.old-deja/g++.law/visibility12.C
index 4dbb15891e1..59467ba7d80 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility12.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility12.C
@@ -6,7 +6,7 @@
// Subject: member access rule bug
// Message-ID: <9306300528.AA17185@coda.mel.dit.CSIRO.AU>
struct a {
- int aa; // { dg-error "" } private
+ int aa; // { dg-message "" } private
};
class b : private a {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility15.C b/gcc/testsuite/g++.old-deja/g++.law/visibility15.C
index 434d7da9239..9b36f591375 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility15.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility15.C
@@ -10,7 +10,7 @@
class X {
private:
- void* operator new(size_t) throw(){// { dg-error "" } .*
+ void* operator new(size_t) throw(){// { dg-message "" } .*
printf("Inside private new().\n");
return NULL;
}
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility16.C b/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
index e4b3bf854a2..3fbc91ebef5 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility16.C
@@ -7,7 +7,7 @@
// Message-ID: <9308051553.AA07639@nwd2sun1.analog.com>
class A {
protected:
- int astuff; // { dg-error "" } protected
+ int astuff; // { dg-message "" } protected
A() {
astuff = 3;
}
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
index 67ef8927a63..bf7a747c705 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility17.C
@@ -31,12 +31,12 @@ private:
int num_;
};
-Base::Base() // { dg-error "is private" }
+Base::Base() // { dg-message "private" }
{
name_ = std::strcpy(new char[std::strlen(" ") + 1], " ");
}
-Base::Base(char* str) // { dg-error "is private" }
+Base::Base(char* str) // { dg-message "private" }
{
if(str != NULL)
name_ = std::strcpy(new char[std::strlen(str) + 1], str);
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility18.C b/gcc/testsuite/g++.old-deja/g++.law/visibility18.C
index cf67c2dccbd..ccbde9137b9 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility18.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility18.C
@@ -7,7 +7,7 @@
// Message-ID: <9308061142.AA08533@iiserv>
struct T1 { int i; };
-struct T2 { int j; }; // { dg-error "" } private
+struct T2 { int j; }; // { dg-message "" } private
struct T3 : public T1, private T2 {
} x;
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility19.C b/gcc/testsuite/g++.old-deja/g++.law/visibility19.C
index f2bb302ca51..c7a096af3ef 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility19.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility19.C
@@ -7,7 +7,7 @@
// Message-ID: <9308252030.AA02352@tnt.acsys.com>
class B {
protected:
- int i; // { dg-error "" } protected
+ int i; // { dg-message "" } protected
};
class D1 : public B {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility20.C b/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
index 0560523bfa4..802274d80ae 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility20.C
@@ -8,7 +8,7 @@
class Base {
protected:
- void protectedBaseFunction() {} // { dg-error "" } protected
+ void protectedBaseFunction() {} // { dg-message "" } protected
public:
Base() {}
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility21.C b/gcc/testsuite/g++.old-deja/g++.law/visibility21.C
index 6a57783c61b..508637d972d 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility21.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility21.C
@@ -7,7 +7,7 @@
// Message-ID: <9308121003.AA02294@mi.el.utwente.nl>
class A {
protected:
- void foo(); // { dg-error "" } protected
+ void foo(); // { dg-message "" } protected
};
class B : public A
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
index 3acd8370795..206a5754081 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility24.C
@@ -14,7 +14,7 @@ template <class T>
class A
{
public:
- void Fun() { printf( "Fun fun fun!\n" ); } // { dg-error "" } private
+ void Fun() { printf( "Fun fun fun!\n" ); } // { dg-message "" } private
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility4.C b/gcc/testsuite/g++.old-deja/g++.law/visibility4.C
index 7f346058ba9..1cdec1c2b55 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility4.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility4.C
@@ -8,7 +8,7 @@
class A {
public:
- int b; // { dg-error "" } private
+ int b; // { dg-message "" } private
};
class C : private A { // NOTE WELL. private, not public
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility5.C b/gcc/testsuite/g++.old-deja/g++.law/visibility5.C
index d8e73e7c998..7333470f6eb 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility5.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility5.C
@@ -4,7 +4,7 @@
class a {
private:
- a (int i);// { dg-error "" } .*
+ a (int i);// { dg-message "" } .*
public:
a ();
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility6.C b/gcc/testsuite/g++.old-deja/g++.law/visibility6.C
index 92747926301..7c1b63dc05e 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility6.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility6.C
@@ -8,7 +8,7 @@
class Top {
public:
Top() {}
- void val() {} // { dg-error "" } private base class
+ void val() {} // { dg-message "" } private base class
};
class Derived : private Top {
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
index ed37f5f8d2b..33358b12b51 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility7.C
@@ -15,9 +15,9 @@ class A {
{}
virtual ~A()
{}
- virtual void Number(int c) // { dg-error "inaccessible" }
+ virtual void Number(int c) // { dg-message "declared" }
{ number = c; }
- virtual int Number() // { dg-error "inaccessible" }
+ virtual int Number() // { dg-message "declared" }
{ return number; }
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility8.C b/gcc/testsuite/g++.old-deja/g++.law/visibility8.C
index 17a3cf8c084..5242dfc804f 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility8.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility8.C
@@ -7,7 +7,7 @@
// Message-ID: <m0nof3E-0021ifC@jts.com
class t1 {
protected:
- int a; // { dg-error "" } protected
+ int a; // { dg-message "" } protected
};
diff --git a/gcc/testsuite/g++.old-deja/g++.law/visibility9.C b/gcc/testsuite/g++.old-deja/g++.law/visibility9.C
index 05e7a22380f..198e4847f0b 100644
--- a/gcc/testsuite/g++.old-deja/g++.law/visibility9.C
+++ b/gcc/testsuite/g++.old-deja/g++.law/visibility9.C
@@ -8,7 +8,7 @@
class A {
protected:
- int a; // { dg-error "" } protected
+ int a; // { dg-message "" } protected
};
class B : public A {
diff --git a/gcc/testsuite/g++.old-deja/g++.niklas/t135.C b/gcc/testsuite/g++.old-deja/g++.niklas/t135.C
index 566b0ca1ba3..d12029d2ca4 100644
--- a/gcc/testsuite/g++.old-deja/g++.niklas/t135.C
+++ b/gcc/testsuite/g++.old-deja/g++.niklas/t135.C
@@ -8,7 +8,7 @@ public:
class C2
{
- int data_member; // { dg-error "" }
+ int data_member; // { dg-message "" }
friend class C1; // { dg-error "" }
};
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/delete1.C b/gcc/testsuite/g++.old-deja/g++.oliva/delete1.C
index 368a87a2a9a..03f535055ea 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/delete1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/delete1.C
@@ -13,7 +13,7 @@
struct foo {
foo() {}
private:
- void operator delete(void *) {} // { dg-error "" } private
+ void operator delete(void *) {} // { dg-message "" } private
} foo_;
struct bar : foo {
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C b/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
index 34fe92e6407..95fff0fe4d9 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/partord1.C
@@ -9,7 +9,7 @@ template <typename T> void foo(T*);
template <typename T> class bar {
private:
- int i; // { dg-error "" } this variable
+ int i; // { dg-message "" } this variable
friend void foo<T>(T);
};
diff --git a/gcc/testsuite/g++.old-deja/g++.other/access11.C b/gcc/testsuite/g++.old-deja/g++.other/access11.C
index 72fc333c1af..bdf26bd37bc 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/access11.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/access11.C
@@ -10,7 +10,7 @@ private:
};
template <>
-void A::g<int>(int t) { i = 1; } // { dg-error "" } private
+void A::g<int>(int t) { i = 1; } // { dg-message "" } private
int main()
{
diff --git a/gcc/testsuite/g++.old-deja/g++.other/access4.C b/gcc/testsuite/g++.old-deja/g++.other/access4.C
index 939bebcf01f..d3c8d85c3f5 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/access4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/access4.C
@@ -1,6 +1,6 @@
// { dg-do assemble }
-struct A { // { dg-error "" } inaccessible
+struct A { // { dg-message "" } inaccessible
static int i;
};
diff --git a/gcc/testsuite/g++.old-deja/g++.other/access7.C b/gcc/testsuite/g++.old-deja/g++.other/access7.C
index 635c6df77fa..19a57d1d368 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/access7.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/access7.C
@@ -4,8 +4,8 @@
class A {
- static int I1; // { dg-error "" } private
- struct B1 { }; // { dg-error "" } private
+ static int I1; // { dg-message "" } private
+ struct B1 { }; // { dg-message "" } private
public:
static int I2;
struct B2 { };
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash1.C b/gcc/testsuite/g++.old-deja/g++.other/crash1.C
index d6296891906..5ee590e310b 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash1.C
@@ -1,7 +1,7 @@
// { dg-do assemble }
class A
{
- enum B { ONE, TWO, THREE }; // { dg-error "" } private
+ enum B { ONE, TWO, THREE }; // { dg-message "" } private
};
class A::B; // { dg-error "" } A::B is not a class type, context
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash7.C b/gcc/testsuite/g++.old-deja/g++.other/crash7.C
index d579df0bffd..aa903274f58 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash7.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash7.C
@@ -4,7 +4,7 @@ void f()
{
union {
private:
- int i; // { dg-error "" } private
+ int i; // { dg-message "" } private
} u;
u.i = 3; // { dg-error "" } within this context
diff --git a/gcc/testsuite/g++.old-deja/g++.other/friend1.C b/gcc/testsuite/g++.old-deja/g++.other/friend1.C
index 56236ab33a6..d2f4b0b636e 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/friend1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/friend1.C
@@ -22,7 +22,7 @@ struct R;
class B {
protected:
- int i; // { dg-error "" } in this context
+ int i; // { dg-message "" } protected
static int j;
};
@@ -51,7 +51,7 @@ D d;
void f()
{
- b.i = 3; // { dg-error "" } protected
+ b.i = 3; // { dg-error "" } in this context
d.i = 4;
B::j = 5;
D::j = 6;
@@ -60,7 +60,7 @@ void f()
template <typename T>
void g()
{
- b.i = 3; // { dg-error "" } protected
+ b.i = 3; // { dg-error "" } in this context
d.i = 4;
B::j = 5;
D::j = 6;
@@ -70,7 +70,7 @@ template void g<int>();
void S::h()
{
- b.i = 3; // { dg-error "" } protected
+ b.i = 3; // { dg-error "" } in this context
d.i = 4;
B::j = 5;
D::j = 6;
@@ -79,7 +79,7 @@ void S::h()
template <typename T>
void R<T>::h()
{
- b.i = 3; // { dg-error "" } protected
+ b.i = 3; // { dg-error "" } in this context
d.i = 4;
B::j = 5;
D::j = 6;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/friend4.C b/gcc/testsuite/g++.old-deja/g++.other/friend4.C
index 41d3a6a487e..cd9e7fa1074 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/friend4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/friend4.C
@@ -10,7 +10,7 @@
template <class A, class B> void foo();
template <class C> class bar {
- int i; // { dg-error "" } private
+ int i; // { dg-message "" } private
template <class B> friend void foo<C,B>(); // { dg-error "" } bogus declaration
};
template <class A, class B> void foo() {
diff --git a/gcc/testsuite/g++.old-deja/g++.other/friend9.C b/gcc/testsuite/g++.old-deja/g++.other/friend9.C
index db9a248f738..3833bb62e99 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/friend9.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/friend9.C
@@ -7,7 +7,7 @@
class F
{
- class Internal; // { dg-error "" } is private
+ class Internal; // { dg-message "" } private
};
class C
diff --git a/gcc/testsuite/g++.old-deja/g++.other/lineno1.C b/gcc/testsuite/g++.old-deja/g++.other/lineno1.C
index 810052250d3..6cc5ebdae77 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/lineno1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/lineno1.C
@@ -5,8 +5,8 @@
class A
{
- A(); // { dg-error "" } private
- ~A(); // { dg-error "" } private
+ A(); // { dg-message "" } private
+ ~A(); // { dg-message "" } private
};
static A a; // { dg-error "" } here
diff --git a/gcc/testsuite/g++.old-deja/g++.other/using1.C b/gcc/testsuite/g++.old-deja/g++.other/using1.C
index 48c29f79b19..6cebc292a41 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/using1.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/using1.C
@@ -3,7 +3,7 @@ class D2;
class B {
private:
- int a; // { dg-error "" } B::a is private
+ int a; // { dg-message "" } B::a declared private
protected:
int b;
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/enum14.C b/gcc/testsuite/g++.old-deja/g++.pt/enum14.C
index 2405cc8f849..f984427d8d1 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/enum14.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/enum14.C
@@ -24,8 +24,8 @@ template <class>
struct B
{
private:
- enum foo {bar}; // { dg-error "" } private
- typedef int baz; // { dg-error "" } private
+ enum foo {bar}; // { dg-message "" } private
+ typedef int baz; // { dg-message "" } private
};
struct D: public B<int>
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend11.C b/gcc/testsuite/g++.old-deja/g++.pt/friend11.C
index 04dbf256988..0f11ef9a959 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend11.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend11.C
@@ -21,7 +21,7 @@ class C
template <class U>
friend void S<T>::f(U);
- int i; // { dg-error "" } private
+ int i; // { dg-message "" } private
};
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend21.C b/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
index 762ea9bae7d..510fcd4c25f 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend21.C
@@ -7,7 +7,7 @@ template <class T> struct A {
template <class T> class B
{
friend class A<T>;
- static int i; // { dg-error "" } private
+ static int i; // { dg-message "" } private
};
template <class T> class C
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/friend3.C b/gcc/testsuite/g++.old-deja/g++.pt/friend3.C
index 11b4064f4c6..9c0cee701d7 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/friend3.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/friend3.C
@@ -7,7 +7,7 @@ class C
{
friend void f<>(double);
- int i; // { dg-error "" } private
+ int i; // { dg-message "" } private
};
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
index 136050d455a..f126f6a6fea 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/inherit2.C
@@ -24,7 +24,7 @@ template <class T> class B
static T value_AC;
};
template <typename T> T B<T>::valueA_AA;
-template <typename T> T B<T>::valueA_AC;// { dg-error "" "" } private -
+template <typename T> T B<T>::valueA_AC;// { dg-message "" "" } private -
template <typename T> T B<T>::value_AC; // { dg-bogus "" "" } -
// this one is a friend
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp74.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp74.C
index 1b64a65095a..65641b4514f 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp74.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp74.C
@@ -5,11 +5,11 @@ class S
{
protected:
template <class U>
- void f(U); // { dg-error "" } is protected
+ void f(U); // { dg-message "" } protected
private:
template <class U>
- void g(U); // { dg-error "" } is private
+ void g(U); // { dg-message "" } private
};
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
index 1a1b5ea5f9f..a449256dfdf 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp89.C
@@ -5,7 +5,7 @@
class Q {
template<class T>
- class X { // { dg-error "" } Q::X private
+ class X { // { dg-message "" } Q::X private
};
};
template<template<class> class XX>
diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb94.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb94.C
index 535023606a7..0b206a0bb11 100644
--- a/gcc/testsuite/g++.old-deja/g++.robertl/eb94.C
+++ b/gcc/testsuite/g++.old-deja/g++.robertl/eb94.C
@@ -10,7 +10,7 @@ static int variable;
class myClass : public baseClass
{
private:
-static int variable; // { dg-error "private" }
+static int variable; // { dg-message "private" }
};
myClass::variable = 0; //{ dg-error "" } no type