Index: include/tuple =================================================================== --- include/tuple +++ include/tuple @@ -511,8 +511,8 @@ typename tuple_element<_Jp, tuple<_Up...> >::type&& get(tuple<_Up...>&&) _NOEXCEPT; public: - template ::value)...>::value + template , _Dummy>::value...>::value >::type> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR tuple() Index: include/type_traits =================================================================== --- include/type_traits +++ include/type_traits @@ -216,6 +216,9 @@ struct __void_t { typedef void type; }; #endif +template +struct _LIBCPP_TYPE_VIS_ONLY __dependent_type : public _Tp {}; + template struct _LIBCPP_TYPE_VIS_ONLY conditional {typedef _If type;}; template Index: test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.cnstr/default.pass.cpp @@ -35,6 +35,16 @@ ThrowingDefault() { } }; +struct IllFormedDefault { + IllFormedDefault(int x) : value(x) {} + template + constexpr IllFormedDefault() { + static_assert(Pred, + "The default constructor should not be instantiated"); + } + int value; +}; + int main() { { @@ -89,5 +99,12 @@ assert(std::get<0>(t) == 0); assert(std::get<1>(t) == nullptr); } + { + // Check that the SFINAE on the default constructor is not evaluted when + // it isn't needed. If the default constructor is evaluted then this test + // should fail to compile. + IllFormedDefault v(0); + std::tuple t(v); + } #endif }