diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-07-27 19:25:28 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-07-27 19:25:28 +0000 |
| commit | 02364191d6f6a2fa680e7238b84d03f298a9cc1b (patch) | |
| tree | 0ea918cd2654656c3f5f2d523f339f36e83cd814 /libcxx | |
| parent | e594b1aaeced5d988fc8896577433cd54045b429 (diff) | |
| download | bcm5719-llvm-02364191d6f6a2fa680e7238b84d03f298a9cc1b.tar.gz bcm5719-llvm-02364191d6f6a2fa680e7238b84d03f298a9cc1b.zip | |
Fix PR10509: http://llvm.org/bugs/show_bug.cgi?id=10509
llvm-svn: 136247
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/utility | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libcxx/include/utility b/libcxx/include/utility index d0aee559a31..358fe765d9d 100644 --- a/libcxx/include/utility +++ b/libcxx/include/utility @@ -226,9 +226,12 @@ struct _LIBCPP_VISIBLE pair 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 |
