Correct for new rules regarding implicitly deleted special members. http://llvm.org/bugs/show_bug.cgi?id=10191
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@134248 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
		@@ -231,8 +231,19 @@ struct _LIBCPP_VISIBLE pair
 | 
			
		||||
                                    is_convertible<_U2, _T2>::value>::type* = 0)
 | 
			
		||||
            : first(__p.first), second(__p.second) {}
 | 
			
		||||
 | 
			
		||||
    _LIBCPP_INLINE_VISIBILITY
 | 
			
		||||
    pair(const pair& __p)
 | 
			
		||||
        _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value &&
 | 
			
		||||
                   is_nothrow_copy_constructible<second_type>::value)
 | 
			
		||||
        : first(__p.first),
 | 
			
		||||
          second(__p.second)
 | 
			
		||||
    {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    _LIBCPP_INLINE_VISIBILITY
 | 
			
		||||
    pair& operator=(const pair& __p)
 | 
			
		||||
        _NOEXCEPT_(is_nothrow_copy_assignable<first_type>::value &&
 | 
			
		||||
                   is_nothrow_copy_assignable<second_type>::value)
 | 
			
		||||
    {
 | 
			
		||||
        first = __p.first;
 | 
			
		||||
        second = __p.second;
 | 
			
		||||
@@ -258,6 +269,14 @@ struct _LIBCPP_VISIBLE pair
 | 
			
		||||
            : first(_VSTD::forward<_U1>(__p.first)),
 | 
			
		||||
              second(_VSTD::forward<_U2>(__p.second)) {}
 | 
			
		||||
 | 
			
		||||
    _LIBCPP_INLINE_VISIBILITY
 | 
			
		||||
    pair(pair&& __p) _NOEXCEPT_(is_nothrow_move_constructible<first_type>::value &&
 | 
			
		||||
                                is_nothrow_move_constructible<second_type>::value)
 | 
			
		||||
        : first(_VSTD::forward<first_type>(__p.first)),
 | 
			
		||||
          second(_VSTD::forward<second_type>(__p.second))
 | 
			
		||||
    {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    _LIBCPP_INLINE_VISIBILITY
 | 
			
		||||
    pair&
 | 
			
		||||
    operator=(pair&& __p) _NOEXCEPT_(is_nothrow_move_assignable<first_type>::value &&
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user