Author: hhinnant
Date: Wed Jul 27 14:25:28 2011
New Revision: 136247
URL: http://llvm.org/viewvc/llvm-project?rev=136247&view=rev
Log:
Fix PR10509: http://llvm.org/bugs/show_bug.cgi?id=10509
Modified:
libcxx/trunk/include/utility
Modified: libcxx/trunk/include/utility
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/utility?rev=136247&r1=136246&r2=136247&view=diff
==============================================================================
--- libcxx/trunk/include/utility (original)
+++ libcxx/trunk/include/utility Wed Jul 27 14:25:28 2011
@@ -226,9 +226,12 @@
template<class _U1, class _U2>
_LIBCPP_INLINE_VISIBILITY
- pair(const pair<_U1, _U2>& __p,
- typename enable_if<is_constructible<_T1, _U1>::value &&
- is_constructible<_T2, _U2>::value>::type*
= 0)
+ pair(const pair<_U1, _U2>& __p
+#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
+ ,typename enable_if<is_constructible<_T1, _U1>::value &&
+ is_constructible<_T2, _U2>::value>::type*
= 0
+#endif
+ )
: first(__p.first), second(__p.second) {}
_LIBCPP_INLINE_VISIBILITY
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
