Author: rsmith
Date: Thu Aug 21 15:43:52 2014
New Revision: 216221
URL: http://llvm.org/viewvc/llvm-project?rev=216221&view=rev
Log:
Fix grammatical error in diagnostic.
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/SemaTemplate/deduction.cpp
cfe/trunk/test/SemaTemplate/derived.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=216221&r1=216220&r2=216221&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Thu Aug 21 15:43:52
2014
@@ -2782,7 +2782,7 @@ def note_ovl_candidate_instantiation_dep
"candidate template ignored: substitution exceeded maximum template "
"instantiation depth">;
def note_ovl_candidate_underqualified : Note<
- "candidate template ignored: can't deduce a type for %0 which would "
+ "candidate template ignored: can't deduce a type for %0 that would "
"make %2 equal %1">;
def note_ovl_candidate_substitution_failure : Note<
"candidate template ignored: substitution failure%0%1">;
Modified: cfe/trunk/test/SemaTemplate/deduction.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/deduction.cpp?rev=216221&r1=216220&r2=216221&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/deduction.cpp (original)
+++ cfe/trunk/test/SemaTemplate/deduction.cpp Thu Aug 21 15:43:52 2014
@@ -107,7 +107,7 @@ namespace PR7463 {
}
namespace test0 {
- template <class T> void make(const T *(*fn)()); // expected-note {{candidate
template ignored: can't deduce a type for 'T' which would make 'const T' equal
'char'}}
+ template <class T> void make(const T *(*fn)()); // expected-note {{candidate
template ignored: can't deduce a type for 'T' that would make 'const T' equal
'char'}}
char *char_maker();
void test() {
make(char_maker); // expected-error {{no matching function for call to
'make'}}
Modified: cfe/trunk/test/SemaTemplate/derived.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/derived.cpp?rev=216221&r1=216220&r2=216221&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/derived.cpp (original)
+++ cfe/trunk/test/SemaTemplate/derived.cpp Thu Aug 21 15:43:52 2014
@@ -4,8 +4,8 @@
template<typename T> class vector2 {};
template<typename T> class vector : vector2<T> {};
-template<typename T> void Foo2(vector2<const T*> V) {} //
expected-note{{candidate template ignored: can't deduce a type for 'T' which
would make 'const T' equal 'int'}}
-template<typename T> void Foo(vector<const T*> V) {} // expected-note
{{candidate template ignored: can't deduce a type for 'T' which would make
'const T' equal 'int'}}
+template<typename T> void Foo2(vector2<const T*> V) {} //
expected-note{{candidate template ignored: can't deduce a type for 'T' that
would make 'const T' equal 'int'}}
+template<typename T> void Foo(vector<const T*> V) {} // expected-note
{{candidate template ignored: can't deduce a type for 'T' that would make
'const T' equal 'int'}}
void test() {
Foo2(vector2<int*>()); // expected-error{{no matching function for call to
'Foo2'}}
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
