summaryrefslogtreecommitdiffstats
path: root/clang/test/SemaTemplate
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/SemaTemplate')
-rw-r--r--clang/test/SemaTemplate/deduction.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/clang/test/SemaTemplate/deduction.cpp b/clang/test/SemaTemplate/deduction.cpp
index 8cd4331755a..9471bac91c3 100644
--- a/clang/test/SemaTemplate/deduction.cpp
+++ b/clang/test/SemaTemplate/deduction.cpp
@@ -338,16 +338,13 @@ namespace member_pointer {
}
namespace deduction_substitution_failure {
- template<typename T> struct Fail { typedef typename T::error error; }; // expected-error {{prior to '::'}}
+ template<typename T> struct Fail { typedef typename T::error error; }; // expected-error 2{{prior to '::'}}
template<typename T, typename U> struct A {};
template<typename T> struct A<T, typename Fail<T>::error> {}; // expected-note {{instantiation of}}
A<int, int> ai; // expected-note {{during template argument deduction for class template partial specialization 'A<T, typename Fail<T>::error>' [with T = int]}}
- // FIXME: This tickles an assertion.
-#if 0
template<typename T, typename U> int B; // expected-warning 0-1 {{extension}}
- template<typename T> int B<T, typename Fail<T>::error> {};
- int bi = B<char, char>;
-#endif
+ template<typename T> int B<T, typename Fail<T>::error> {}; // expected-note {{instantiation of}}
+ int bi = B<char, char>; // expected-note {{during template argument deduction for variable template partial specialization 'B<T, typename Fail<T>::error>' [with T = char]}}
}
OpenPOWER on IntegriCloud