From f091e129dbf75f5e52bf5ff000d4fd049cc9c06c Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 15 Sep 2015 01:28:55 +0000 Subject: [modules] A using-declaration doesn't introduce a new entity, just a new name for an existing entity, and as such a using-declaration doesn't need to conflict with a hidden entity (nor vice versa). llvm-svn: 247654 --- clang/test/Modules/Inputs/using-decl-b.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'clang/test/Modules/Inputs/using-decl-b.h') diff --git a/clang/test/Modules/Inputs/using-decl-b.h b/clang/test/Modules/Inputs/using-decl-b.h index b82526f39ff..b4f206fa443 100644 --- a/clang/test/Modules/Inputs/using-decl-b.h +++ b/clang/test/Modules/Inputs/using-decl-b.h @@ -9,3 +9,29 @@ namespace UsingDecl { using ::using_decl_type; using ::using_decl_var; } + +namespace X { + int conflicting_hidden_using_decl; + int conflicting_hidden_using_decl_fn(); + int conflicting_hidden_using_decl_var; + struct conflicting_hidden_using_decl_struct; + + int conflicting_hidden_using_decl_mixed_1; + int conflicting_hidden_using_decl_mixed_2(); + struct conflicting_hidden_using_decl_mixed_3 {}; +} + +using X::conflicting_hidden_using_decl; +using X::conflicting_hidden_using_decl_fn; +using X::conflicting_hidden_using_decl_var; +using X::conflicting_hidden_using_decl_struct; +int conflicting_hidden_using_decl_fn_2(); +int conflicting_hidden_using_decl_var_2; +struct conflicting_hidden_using_decl_struct_2 {}; + +using X::conflicting_hidden_using_decl_mixed_1; +using X::conflicting_hidden_using_decl_mixed_2; +using X::conflicting_hidden_using_decl_mixed_3; +int conflicting_hidden_using_decl_mixed_4; +int conflicting_hidden_using_decl_mixed_5(); +struct conflicting_hidden_using_decl_mixed_6 {}; -- cgit v1.2.3