diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:54:38 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:54:38 -0800 |
| commit | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (patch) | |
| tree | 5425d058e199bade4f43cf0dc526a52f4b556b71 /system/include/libcxx/utility | |
| parent | 7844db37f5b6dce1e7772f955ff606ef806ae032 (diff) | |
| parent | ee4a2df911e834285aed9148eb4cab4546c8a063 (diff) | |
Merge pull request #2004 from waywardmonkeys/updates
Updates
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 && |