From: Peter Collingbourne Date: Wed, 5 Mar 2014 02:12:55 +0000 (+0000) Subject: Merge using-decl-pr17575.cpp into existing test case. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bba282cd548c3cbf91b5c58f4720465738207957;p=clang 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 00edee690d..4ffb93a1ef 100644 --- 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 index 7fe60410d8..0000000000 --- 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() {}