From 64ab30392da6818717c2a6fd530559b472dedf2d Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Fri, 15 Mar 2013 23:55:09 +0000 Subject: Improve template diffing handling of default integer values. When the template argument is both default and value dependent, the expression retrieved for the default argument cannot be evaluated, thus never matching any argument value. To get the proper value, get the template argument from the desugared template specialization. Also, output the original expression to provide more information about the argument mismatch. llvm-svn: 177209 --- clang/test/Misc/diag-template-diffing.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/test/Misc/diag-template-diffing.cpp') diff --git a/clang/test/Misc/diag-template-diffing.cpp b/clang/test/Misc/diag-template-diffing.cpp index 6be705511db..ac15dfe29cf 100644 --- a/clang/test/Misc/diag-template-diffing.cpp +++ b/clang/test/Misc/diag-template-diffing.cpp @@ -797,7 +797,7 @@ namespace PR14342 { X x = X(); X y = X(); // CHECK-ELIDE-NOTREE: error: no viable conversion from 'X' to 'X' - // CHECK-ELIDE-NOTREE: error: no viable conversion from 'X<[...], 2>' to 'X<[...], 3UL>' + // CHECK-ELIDE-NOTREE: error: no viable conversion from 'X<[...], 2>' to 'X<[...], 3>' } namespace PR14489 { -- cgit v1.2.3