[c++1z] P0195R2: Allow multiple using-declarators in a single using-declaration.

llvm-svn: 289905

2 files changed, 31 insertions, 1 deletions

diff --git a/clang/test/Parser/cxx0x-decl.cpp b/clang/test/Parser/cxx0x-decl.cpp
index c4f03566029..d912e19287b 100644
--- a/clang/test/Parser/cxx0x-decl.cpp
+++ b/clang/test/Parser/cxx0x-decl.cpp
@@ -136,5 +136,5 @@ template<int ...N> void NoMissingSemicolonHereEither(struct S
                                                      ... [N]);
 
 // This must be at the end of the file; we used to look ahead past the EOF token here.
-// expected-error@+1 {{expected unqualified-id}}
+// expected-error@+1 {{expected unqualified-id}} expected-error@+1{{expected ';'}}
 using
diff --git a/clang/test/Parser/cxx1z-using-declaration.cpp b/clang/test/Parser/cxx1z-using-declaration.cpp
new file mode 100644
index 00000000000..dab1ca82c2a
--- /dev/null
+++ b/clang/test/Parser/cxx1z-using-declaration.cpp
@@ -0,0 +1,30 @@
+// RUN: %clang_cc1 -std=c++1z -verify %s
+
+namespace A {
+  int m, n;
+};
+
+namespace B {
+  using A::m, A::n, A::n;
+  int q = m + n;
+}
+
+struct X {
+  int x1, x2, y, z; // expected-note {{conflicting}}
+};
+struct Y {
+  int x1, x2, y, z; // expected-note {{target}}
+};
+struct Z : X, Y {
+  using X::x1,
+        blah::blah, // expected-error {{undeclared}}
+        X::x2, // expected-note {{previous}}
+        Y::y,
+        X::x2, // expected-error {{redeclaration}}
+        X::z,
+        Y::z; // expected-error {{conflicts with}}
+};
+int X::*px1 = &Z::x1;
+int X::*px2 = &Z::x2;
+int Y::*py = &Z::y;
+int X::*pz = &Z::z;