summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/Inputs
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/Modules/Inputs')
-rw-r--r--clang/test/Modules/Inputs/using-decl-a.h1
-rw-r--r--clang/test/Modules/Inputs/using-decl-b.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/using-decl-a.h b/clang/test/Modules/Inputs/using-decl-a.h
index 85a4788e764..1d1ffe9ed35 100644
--- a/clang/test/Modules/Inputs/using-decl-a.h
+++ b/clang/test/Modules/Inputs/using-decl-a.h
@@ -1,5 +1,6 @@
typedef int using_decl_type;
int using_decl_var;
+int merged;
namespace UsingDecl {
using ::using_decl_type;
diff --git a/clang/test/Modules/Inputs/using-decl-b.h b/clang/test/Modules/Inputs/using-decl-b.h
index b4f206fa443..7c03d09960e 100644
--- a/clang/test/Modules/Inputs/using-decl-b.h
+++ b/clang/test/Modules/Inputs/using-decl-b.h
@@ -8,6 +8,7 @@ namespace UsingDecl {
namespace UsingDecl {
using ::using_decl_type;
using ::using_decl_var;
+ using ::merged;
}
namespace X {
OpenPOWER on IntegriCloud