diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-12-30 11:49:41 +0000 |
| commit | 45b533945f0851ec234ca846e1af5ee1e4df0b6e (patch) | |
| tree | 0a5b74c0b9ca73aded34df95c91fcaf3815230d8 /test/Modules/Inputs/using-decl-b.h | |
| parent | 7e86edd64bfae4e324224452e4ea879b3371a4bd (diff) | |
| download | src-45b533945f0851ec234ca846e1af5ee1e4df0b6e.tar.gz src-45b533945f0851ec234ca846e1af5ee1e4df0b6e.zip | |
Vendor import of clang trunk r256633:vendor/clang/clang-trunk-r256633
Notes
Notes:
svn path=/vendor/clang/dist/; revision=292920
svn path=/vendor/clang/clang-trunk-r256633/; revision=292923; tag=vendor/clang/clang-trunk-r256633
Diffstat (limited to 'test/Modules/Inputs/using-decl-b.h')
| -rw-r--r-- | test/Modules/Inputs/using-decl-b.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/test/Modules/Inputs/using-decl-b.h b/test/Modules/Inputs/using-decl-b.h index b82526f39ff4..7c03d09960ed 100644 --- a/test/Modules/Inputs/using-decl-b.h +++ b/test/Modules/Inputs/using-decl-b.h @@ -8,4 +8,31 @@ namespace UsingDecl { namespace UsingDecl { using ::using_decl_type; using ::using_decl_var; + using ::merged; } + +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 {}; |