diff options
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 0be81677d9f..dab1ca82c2a 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}} |
