Merge using-decl-pr17575.cpp into existing test case.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202925 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp b/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp
index 00edee690dc1da275cd43f24b1204a3d18c6dd58..4ffb93a1ef74d8c8dc0f04185ad3b931f93fadae 100644 (file)
--- a/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp
+++ b/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp
@@ -101,3 +101,9 @@ namespace test6 {
   }
   void foo(); // expected-error {{declaration conflicts with target of using declaration already in scope}}
 }
+
+namespace test7 {
+  void foo();
+  using test7::foo;
+  void foo() {}
+}

diff --git a/test/SemaCXX/using-decl-pr17575.cpp b/test/SemaCXX/using-decl-pr17575.cpp
deleted file mode 100644 (file)
index 7fe6041..0000000
--- a/test/SemaCXX/using-decl-pr17575.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-// expected-no-diagnostics
-
-void bar();
-namespace foo { using ::bar; }
-using foo::bar;
-void bar() {}
-
-void f();
-using ::f;
-void f() {}