summaryrefslogtreecommitdiffstats
path: root/libcxx/include/__tuple
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/include/__tuple')
-rw-r--r--libcxx/include/__tuple4
1 files changed, 0 insertions, 4 deletions
diff --git a/libcxx/include/__tuple b/libcxx/include/__tuple
index a9514c1e36f..918656ed838 100644
--- a/libcxx/include/__tuple
+++ b/libcxx/include/__tuple
@@ -214,11 +214,7 @@ struct __tuple_convertible_imp : public false_type {};
template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
struct __tuple_convertible_imp<true, __tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
: public integral_constant<bool,
-#if 1 // waiting on cwg 1170
- is_convertible<_Tp0, _Up0>::value &&
-#else
is_constructible<_Up0, _Tp0>::value &&
-#endif
__tuple_convertible_imp<true, __tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
template <>
OpenPOWER on IntegriCloud