diff options
author | Daniel Jasper <djasper@google.com> | 2016-12-19 10:09:25 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2016-12-19 10:09:25 +0000 |
commit | 9949ead55ad85698096af2fda29e8c6bb00a09b9 (patch) | |
tree | cb7551d743a7326e28591672cc19f3c5ff0a2004 /clang/test/Parser/cxx1z-using-declaration.cpp | |
parent | 03b8be575e36f847387e314cfab75c2ae54e831f (diff) | |
download | llvm-9949ead55ad85698096af2fda29e8c6bb00a09b9.zip llvm-9949ead55ad85698096af2fda29e8c6bb00a09b9.tar.gz llvm-9949ead55ad85698096af2fda29e8c6bb00a09b9.tar.bz2 |
Revert "[c++1z] P0195R2: Support pack-expansion of using-declarations."
This reverts commit r290080 as it leads to many Clang crashes, e.g.:
http://lab.llvm.org:8011/builders/clang-cmake-aarch64-quick/builds/1814
llvm-svn: 290092
Diffstat (limited to 'clang/test/Parser/cxx1z-using-declaration.cpp')
-rw-r--r-- | clang/test/Parser/cxx1z-using-declaration.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/clang/test/Parser/cxx1z-using-declaration.cpp b/clang/test/Parser/cxx1z-using-declaration.cpp index 0be8167..dab1ca8 100644 --- a/clang/test/Parser/cxx1z-using-declaration.cpp +++ b/clang/test/Parser/cxx1z-using-declaration.cpp @@ -10,10 +10,10 @@ namespace B { } struct X { - int x1, x2, y, z; // expected-note 2{{conflicting}} + int x1, x2, y, z; // expected-note {{conflicting}} }; struct Y { - int x1, x2, y, z; // expected-note 2{{target}} + int x1, x2, y, z; // expected-note {{target}} }; struct Z : X, Y { using X::x1, @@ -28,8 +28,3 @@ int X::*px1 = &Z::x1; int X::*px2 = &Z::x2; int Y::*py = &Z::y; int X::*pz = &Z::z; - -template<typename ...T> struct Q : T... { - using T::z...; // expected-error {{conflicts}} -}; -Q<X,Y> q; // expected-note {{instantiation of}} |