r290997 - Revert accidentally-committed file.

Richard Smith via cfe-commits cfe-commits at lists.llvm.org
Wed Jan 4 11:48:07 PST 2017


Author: rsmith
Date: Wed Jan  4 13:48:07 2017
New Revision: 290997

URL: http://llvm.org/viewvc/llvm-project?rev=290997&view=rev
Log:
Revert accidentally-committed file.

Modified:
    cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp

Modified: cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=290997&r1=290996&r2=290997&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp (original)
+++ cfe/trunk/test/SemaCXX/cxx0x-initializer-stdinitializerlist.cpp Wed Jan  4 13:48:07 2017
@@ -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}}




More information about the cfe-commits mailing list