diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-15 17:01:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-15 17:01:19 -0800 |
| commit | c42b937808924f6b922b29d2e0fd1fe1d1b0411c (patch) | |
| tree | 4027d435b6638a7e72b9519990298fb9314ecc96 /system/include/libcxx/utility | |
| parent | 8478d6aee54d6c52de16d8c58309534afbf5bf9e (diff) | |
| parent | e5ccf17e84e7a5102bf9e05ffef01e6672b4c15a (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'system/include/libcxx/utility')
| -rw-r--r-- | system/include/libcxx/utility | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/include/libcxx/utility b/system/include/libcxx/utility index 5fc2cf20..2c1f62cc 100644 --- a/system/include/libcxx/utility +++ b/system/include/libcxx/utility @@ -272,10 +272,10 @@ struct _LIBCPP_TYPE_VIS_ONLY pair ) : first(__p.first), second(__p.second) {} -#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS +#if !defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && _LIBCPP_TRIVIAL_PAIR_COPY_CTOR _LIBCPP_INLINE_VISIBILITY pair(const pair& __p) = default; -#else +#elif !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) || !_LIBCPP_TRIVIAL_PAIR_COPY_CTOR _LIBCPP_INLINE_VISIBILITY pair(const pair& __p) _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value && |