aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/testsuite')
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/g++.dg/conversion/cast1.C22
-rw-r--r--gcc/testsuite/g++.dg/overload/pmf1.C2
3 files changed, 29 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b7f25dd..ae62312 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-21 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/10841
+ * g++.dg/conversion/cast1.C: New test.
+ * g++.dg/overload/pmf1.C: Adjust error marker.
+
2004-10-21 Andrew Pinski <pinskia@physics.uc.edu>
PR objc/17923
diff --git a/gcc/testsuite/g++.dg/conversion/cast1.C b/gcc/testsuite/g++.dg/conversion/cast1.C
new file mode 100644
index 0000000..f90b421
--- /dev/null
+++ b/gcc/testsuite/g++.dg/conversion/cast1.C
@@ -0,0 +1,22 @@
+// PR c++/10841
+
+int main() {
+ class Base {
+ public:
+ int i, j, k;
+ void f(); };
+
+ class Derived : private Base {
+ public:
+ int m, n, p;
+ void g();
+ };
+
+ Derived derived;
+ Base &base = (Base &)derived;
+ (int Base::*)&Derived::n;
+ (int Derived::*)&Base::j;
+ (void (Base::*)(void))&Derived::g;
+ (void (Derived::*)(void))&Base::f;
+}
+
diff --git a/gcc/testsuite/g++.dg/overload/pmf1.C b/gcc/testsuite/g++.dg/overload/pmf1.C
index b97f64e..d200749 100644
--- a/gcc/testsuite/g++.dg/overload/pmf1.C
+++ b/gcc/testsuite/g++.dg/overload/pmf1.C
@@ -17,5 +17,5 @@ void f (C) {} // even though this would be well-formed
int main ()
{
- f (aip); // { dg-error "'A' is an inaccessible base of 'B'" "" }
+ f (aip); // { dg-error "'A' is an inaccessible base of 'B'|conversion" "" }
}