Author: ericwf
Date: Tue May 29 19:20:40 2018
New Revision: 333491
URL: http://llvm.org/viewvc/llvm-project?rev=333491&view=rev
Log:
Fix test failure after r333485. Try 2.
Sorry for the breakage.
Modified:
cfe/trunk/test/Misc/diag-template-diffing.cpp
Modified: cfe/trunk/test/Misc/diag-template-diffing.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/diag-template-diffing.cpp?rev=333491&r1=333490&r2=333491&view=diff
==============================================================================
--- cfe/trunk/test/Misc/diag-template-diffing.cpp (original)
+++ cfe/trunk/test/Misc/diag-template-diffing.cpp Tue May 29 19:20:40 2018
@@ -1401,7 +1401,7 @@ void run() {
f(1, integral_constant<bool, true>{});
}
// CHECK-ELIDE-NOTREE: error: no matching function for call to 'f'
-// CHECK-ELIDE-NOTREE: note: candidate function not viable: no known
conversion from 'integral_constant<[...], true>' to 'integral_constant<[...],
false>' for 2nd argument
+// CHECK-ELIDE-NOTREE: note: candidate function template not viable: no known
conversion from 'integral_constant<[...], true>' to 'integral_constant<[...],
false>' for 2nd argument
}
namespace ZeroArgs {
@@ -1454,7 +1454,7 @@ void run() {
D<X::X1>(VectorType<X::X2>());
}
// CHECK-ELIDE-NOTREE: error: no matching function for call to 'D'
-// CHECK-ELIDE-NOTREE: note: candidate function not viable: no known
conversion from 'VectorType<X::X2>' to 'const VectorType<(TypeAlias::X)0>' for
1st argument
+// CHECK-ELIDE-NOTREE: note: candidate function template not viable: no known
conversion from 'VectorType<X::X2>' to 'const VectorType<(TypeAlias::X)0>' for
1st argument
}
namespace TypeAlias2 {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
