From df90325d4c0a65ee64d2dae3ed9b5b34f7418533 Mon Sep 17 00:00:00 2001
From: rdivacky <rdivacky@FreeBSD.org>
Date: Wed, 3 Mar 2010 17:28:16 +0000
Subject: Update clang to 97654.

---
 test/ASTMerge/Inputs/namespace2.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 test/ASTMerge/Inputs/namespace2.cpp

(limited to 'test/ASTMerge/Inputs/namespace2.cpp')

diff --git a/test/ASTMerge/Inputs/namespace2.cpp b/test/ASTMerge/Inputs/namespace2.cpp
new file mode 100644
index 0000000..80429f7
--- /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;
+}
-- 
cgit v1.1