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

[Peter Collingbourne]

Author: pcc
Date: Tue Mar  4 20:12:55 2014
New Revision: 202925

URL: http://llvm.org/viewvc/llvm-project?rev=202925&view=rev
Log:
Merge using-decl-pr17575.cpp into existing test case.

Removed:
    cfe/trunk/test/SemaCXX/using-decl-pr17575.cpp
Modified:
    cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp

Modified: cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp?rev=202925&r1=202924&r2=202925&view=diff
==============================================================================
--- cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp (original)
+++ cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p11.cpp Tue Mar  4 20:12:55 2014
@@ -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() {}
+}

Removed: cfe/trunk/test/SemaCXX/using-decl-pr17575.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/using-decl-pr17575.cpp?rev=202924&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/using-decl-pr17575.cpp (original)
+++ cfe/trunk/test/SemaCXX/using-decl-pr17575.cpp (removed)
@@ -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() {}