3 files changed, 19 insertions, 2 deletions
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
index 34c1251..87a3525 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog
@@ -1,5 +1,8 @@
 1999-07-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ns1.C: Typo.
+	* ns2.C: New test.
+
 	* template2.C: New test.
 
 	* ns1.C: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ns1.C b/gcc/testsuite/g++.old-deja/g++.oliva/ns1.C
index 3ea6b87..f26559e 100644
--- a/gcc/testsuite/g++.old-deja/g++.oliva/ns1.C
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ns1.C
@@ -3,12 +3,11 @@
 // Copyright (C) 1999 Free Software Foundation
 
 // by Alexandre Oliva <oliva@dcc.unicamp.br>
-
 // based on bug report by Dima Volodin <dvv@dvv.ru>
 
 void foo();
 namespace bar {
   class baz {
-    friend void ::f(); // gets bogus error - parse error - XFAIL *-*-*
+    friend void ::foo(); // gets bogus error - parse error - XFAIL *-*-*
   };
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.oliva/ns2.C b/gcc/testsuite/g++.old-deja/g++.oliva/ns2.C
new file mode 100644
index 0000000..10e3f44
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.oliva/ns2.C
@@ -0,0 +1,15 @@
+// Build don't link:
+
+// Copyright (C) 1999 Free Software Foundation
+
+// by Alexandre Oliva <oliva@dcc.unicamp.br>
+// based on bug report by Dima Volodin <dvv@dvv.ru>
+// variation of ns1.C
+
+void foo();
+namespace bar {
+  using ::foo;
+  class baz {
+    friend void foo(); // gets bogus error - conflict - XFAIL *-*-*
+  };
+}