From eb2692571fab1cc9996c0b972aee5e1c48ae0989 Mon Sep 17 00:00:00 2001
From: Howard Hinnant <hhinnant@apple.com>
Date: Tue, 10 Aug 2010 20:48:29 +0000
Subject: patch by Jesse Towner, and bug fix by Sebastian Redl

llvm-svn: 110724
---
 libcxx/include/utility | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libcxx/include/utility')

diff --git a/libcxx/include/utility b/libcxx/include/utility
index 578d3130766..19e2893a3ac 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -223,6 +223,8 @@ struct pair
               second(_STD::forward<_U2>(__u2))
             {}
 
+#ifndef _LIBCPP_HAS_NO_VARIADICS
+
     template<class _Tuple,
              class = typename enable_if<__tuple_convertible<_Tuple, pair>::value>::type>
         _LIBCPP_INLINE_VISIBILITY
@@ -233,7 +235,6 @@ struct pair
                                    typename __make_tuple_types<_Tuple>::type>::type>(get<1>(__p)))
             {}
 
-#ifndef _LIBCPP_HAS_NO_VARIADICS
     template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
         pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
                                     tuple<_Args2...> __second_args)
@@ -241,7 +242,6 @@ struct pair
                    typename __make_tuple_indices<sizeof...(_Args1)>::type(),
                    typename __make_tuple_indices<sizeof...(_Args2) >::type())
             {}
-#endif
 
     template <class _Tuple,
               class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type>
@@ -256,6 +256,8 @@ struct pair
             return *this;
         }
 
+#endif
+
 #else
     template<class _U1, class _U2>
         _LIBCPP_INLINE_VISIBILITY pair(const pair<_U1, _U2>& __p)
-- 
cgit v1.2.3