diff options
author | John McCall <rjmccall@apple.com> | 2010-08-05 09:05:08 +0000 |
---|---|---|
committer | John McCall <rjmccall@apple.com> | 2010-08-05 09:05:08 +0000 |
commit | 42d7d19710d09f00f030eff543ff8841b5b56c64 (patch) | |
tree | e2637aec453b2615247415d67b2e5f8553a6a5d7 /clang/lib/Sema/SemaTemplateDeduction.cpp | |
parent | 478fdb16dbe1ec39b578c144d2d767633178a503 (diff) | |
download | bcm5719-llvm-42d7d19710d09f00f030eff543ff8841b5b56c64.tar.gz bcm5719-llvm-42d7d19710d09f00f030eff543ff8841b5b56c64.zip |
TDK_InconsistentQuals is really totally different from TDK_Inconsistent.
Rename it to TDK_Underqualified to avoid this sort of confusion and give it
its own diagnostic.
llvm-svn: 110318
Diffstat (limited to 'clang/lib/Sema/SemaTemplateDeduction.cpp')
-rw-r--r-- | clang/lib/Sema/SemaTemplateDeduction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp index 3f54bbe4336..e677b2666bb 100644 --- a/clang/lib/Sema/SemaTemplateDeduction.cpp +++ b/clang/lib/Sema/SemaTemplateDeduction.cpp @@ -428,9 +428,9 @@ DeduceTemplateArguments(Sema &S, // type. if (Param.isMoreQualifiedThan(Arg) && !(TDF & TDF_IgnoreQualifiers)) { Info.Param = cast<TemplateTypeParmDecl>(TemplateParams->getParam(Index)); - Info.FirstArg = Deduced[Index]; + Info.FirstArg = TemplateArgument(Param); Info.SecondArg = TemplateArgument(Arg); - return Sema::TDK_InconsistentQuals; + return Sema::TDK_Underqualified; } assert(TemplateTypeParm->getDepth() == 0 && "Can't deduce with depth > 0"); |