diff options
author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2014-01-12 16:13:42 +0700 |
---|---|---|
committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2014-01-13 17:59:15 +0700 |
commit | 5d078cbbd7d4319ed6a852e14bf3e45f58a99511 (patch) | |
tree | 65844da2a4220c28f701cf16c7578fa935671a4f /system/include/libcxx/utility | |
parent | 44cb63a6ecea58dc21d20843f5af0a006f8b36cd (diff) |
Update libcxx to current version.
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 && |