diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-02-16 04:22:56 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-02-16 04:22:56 +0000 |
| commit | f0393bf0a5305fa0123f0582747c055218c5ed2e (patch) | |
| tree | 1d811c24009ea64855637e77298e54f303ed9a32 /clang/test/SemaTemplate/deduction.cpp | |
| parent | dec4ab0d0dbfc3e6aeb3eefd74d05d93b4eb3c6a (diff) | |
| download | bcm5719-llvm-f0393bf0a5305fa0123f0582747c055218c5ed2e.tar.gz bcm5719-llvm-f0393bf0a5305fa0123f0582747c055218c5ed2e.zip | |
Revert r295277 to fix buildbot.
llvm-svn: 295281
Diffstat (limited to 'clang/test/SemaTemplate/deduction.cpp')
| -rw-r--r-- | clang/test/SemaTemplate/deduction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/SemaTemplate/deduction.cpp b/clang/test/SemaTemplate/deduction.cpp index f2d05057269..16e01a93463 100644 --- a/clang/test/SemaTemplate/deduction.cpp +++ b/clang/test/SemaTemplate/deduction.cpp @@ -127,12 +127,12 @@ namespace test1 { namespace test2 { template<typename T> struct Const { typedef void const type; }; - template<typename T> void f(T, typename Const<T>::type*); // expected-note {{candidate}} - template<typename T> void f(T, void const *); // expected-note {{candidate}} + template<typename T> void f(T, typename Const<T>::type*); + template<typename T> void f(T, void const *); void test() { void *p = 0; - f(0, p); // expected-error {{ambiguous}} + f(0, p); } } |
