diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/SemaTemplate/dependent-type-identity.cpp | 2 | ||||
| -rw-r--r-- | test/SemaTemplate/nested-template.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/test/SemaTemplate/dependent-type-identity.cpp b/test/SemaTemplate/dependent-type-identity.cpp index 739cb7f39f..b7c9040e6c 100644 --- a/test/SemaTemplate/dependent-type-identity.cpp +++ b/test/SemaTemplate/dependent-type-identity.cpp @@ -59,7 +59,7 @@ struct X1 { void f6(typename N::X2<U>::template apply<U> *); void f6(typename N::X2<U>::template apply<T> *); void f6(typename ::N::X2<type>::template apply<U_type> *); // expected-error{{redeclar}} - + void f7(typename N::X2<T>::template apply<U> *); // expected-note{{previous}} void f7(typename N::X2<U>::template apply<U> *); void f7(typename N::X2<U>::template apply<T> *); diff --git a/test/SemaTemplate/nested-template.cpp b/test/SemaTemplate/nested-template.cpp index 05ab3e9c1b..3adabcf934 100644 --- a/test/SemaTemplate/nested-template.cpp +++ b/test/SemaTemplate/nested-template.cpp @@ -1,5 +1,4 @@ // RUN: clang-cc -fsyntax-only -verify %s - class A; class S { @@ -25,6 +24,7 @@ struct Outer { T foo(U); template<typename V> T bar(V); + template<typename V> T* bar(V); }; }; @@ -35,9 +35,6 @@ public: void f(X, Y); }; -#if 0 -// FIXME: These don't parse properly because we can't handle the template-name -// "Inner0" or "Inner1" after the dependent type Outer<X>. template<typename X> template<typename Y> void Outer<X>::Inner0<Y>::f(X, Y) { @@ -66,4 +63,10 @@ template<typename Z> X Outer<X>::Inner1<Y>::bar(Z) { return X(); } -#endif
\ No newline at end of file + +template<typename X> +template<typename Y> +template<typename Z> +X* Outer<X>::Inner1<Y>::bar(Z) { + return 0; +} |