diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-01-04 19:48:07 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-01-04 19:48:07 +0000 |
commit | 1b99a9e1264953936696997cc648bb91c2732838 (patch) | |
tree | be2761aea44a804d6ee2690cad05a09bc80b1b4d /clang | |
parent | a7d5ec9a1fb253c7b2f1fb3dd6605707b30c57f0 (diff) | |
download | bcm5719-llvm-1b99a9e1264953936696997cc648bb91c2732838.tar.gz bcm5719-llvm-1b99a9e1264953936696997cc648bb91c2732838.zip |
Revert accidentally-committed file.
llvm-svn: 290997
Diffstat (limited to 'clang')
-rw-r--r-- | clang/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp b/clang/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp index b49a8a2ae45..c8595d2e364 100644 --- a/clang/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp +++ b/clang/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp @@ -104,7 +104,7 @@ template <typename T> T deduce_ref(const std::initializer_list<T>&); // expected-note {{conflicting types for parameter 'T' ('int' vs. 'double')}} template<typename T, typename U> struct pair { pair(...); }; -template<typename T> void deduce_pairs(std::initializer_list<pair<T, typename T::type>>); // expected-note {{something}} +template<typename T> void deduce_pairs(std::initializer_list<pair<T, typename T::type>>); struct WithIntType { typedef int type; }; template<typename ...T> void deduce_after_init_list_in_pack(void (*)(T...), T...); // expected-note {{<int, int> vs. <(no value), double>}} @@ -123,7 +123,7 @@ void argument_deduction() { pair<WithIntType, int> pi; pair<WithIntType, float> pf; deduce_pairs({pi, pi, pi}); // ok - deduce_pairs({pi, pf, pi}); // expected-error {{no matching function}} + deduce_pairs({pi, pf, pi}); // FIXME: This should be rejected, as we fail to produce a type that exactly matches the argument type. deduce_after_init_list_in_pack((void(*)(int,int))0, {}, 0); deduce_after_init_list_in_pack((void(*)(int,int))0, {}, 0.0); // expected-error {{no matching function}} |