aboutsummaryrefslogtreecommitdiff
path: root/test/ASTMerge/Inputs/namespace2.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-02-24 21:53:36 +0000
committerDouglas Gregor <dgregor@apple.com>2010-02-24 21:53:36 +0000
commit5821249f8f95f7c3c059f3135baa98e7b9d9e1fc (patch)
treebb4611f7f470bda2a4748f69f3a76e8f29082590 /test/ASTMerge/Inputs/namespace2.cpp
parent81895a21a192af877dece28ebd88219b3faa9bb2 (diff)
Add test for AST importing of C++ namespaces, missing from a prior commit
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97062 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge/Inputs/namespace2.cpp')
-rw-r--r--test/ASTMerge/Inputs/namespace2.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/test/ASTMerge/Inputs/namespace2.cpp b/test/ASTMerge/Inputs/namespace2.cpp
new file mode 100644
index 0000000000..80429f700b
--- /dev/null
+++ b/test/ASTMerge/Inputs/namespace2.cpp
@@ -0,0 +1,17 @@
+// Merge success
+namespace N1 {
+ extern int x0;
+}
+
+// Merge multiple namespaces
+namespace N2 {
+ extern int x;
+}
+namespace N2 {
+ extern float y;
+}
+
+// Merge namespace with conflict
+namespace N3 {
+ extern double z;
+}