Fix bug, mark expected failure

From-SVN: r25499

diff --git a/gcc/testsuite/g++.old-deja/g++.martin/sts_conv.C b/gcc/testsuite/g++.old-deja/g++.martin/sts_conv.C
index 4a3a436fe7976577f71227f5badd40be54ba45e8..9f06c952d4410b08dec530961dff343c09bf38a1 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.martin/sts_conv.C
+++ b/gcc/testsuite/g++.old-deja/g++.martin/sts_conv.C
@@ -14,7 +14,7 @@ private:
 
 int main(){
   CArray  a;
-  double *pa = a + 1; // gets bogus error - should convert
+  double *pa = a + 1; // gets bogus error - should convert - XFAIL
   return 0; 
 }
 

diff --git a/gcc/testsuite/g++.old-deja/g++.martin/sts_iarr.C b/gcc/testsuite/g++.old-deja/g++.martin/sts_iarr.C
index c05fb16034e79d4394c8d0b0110808bf0b4ea508..a2b63b82a3c87a6859677c18259162ae6483f465 100644 (file)
--- a/gcc/testsuite/g++.old-deja/g++.martin/sts_iarr.C
+++ b/gcc/testsuite/g++.old-deja/g++.martin/sts_iarr.C
@@ -8,13 +8,13 @@ struct Outer{
     Inner(int n): sum(n){}
 
     typename Outer<N-1>::Inner operator[](int n) const
-    { return Outer<N-1>::Inner(sum + n); }
+    { return typename Outer<N-1>::Inner(sum + n); }
 
     int sum;
   };
 
   typename Outer<N-1>::Inner operator[](int n) const
-  { return Outer<N-1>::Inner(n); }
+  { return typename Outer<N-1>::Inner(n); }
 };