diff options
| author | theraven <theraven@FreeBSD.org> | 2012-05-03 17:44:07 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-05-03 17:44:07 +0000 |
| commit | 011d8001e295ab428f3d73602d2e4fa0b248efc4 (patch) | |
| tree | a0abba0a80f7ff64ba1a78df7fd8544414370f33 /contrib/libc++/include/utility | |
| parent | 72d6cdcd97718bf58e38b0484a01bf5c6de14bc4 (diff) | |
| download | FreeBSD-src-011d8001e295ab428f3d73602d2e4fa0b248efc4.zip FreeBSD-src-011d8001e295ab428f3d73602d2e4fa0b248efc4.tar.gz | |
Import new version of libc++. Among other improvements, this comes with an
<atomic> header that works with clang 3.1 (and, importantly, the pre-3.1
snapshot currently in head)
Diffstat (limited to 'contrib/libc++/include/utility')
| -rw-r--r-- | contrib/libc++/include/utility | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libc++/include/utility b/contrib/libc++/include/utility index 7facea3..279d421 100644 --- a/contrib/libc++/include/utility +++ b/contrib/libc++/include/utility @@ -206,8 +206,11 @@ move_if_noexcept(_Tp& __x) _NOEXCEPT } struct _LIBCPP_VISIBLE piecewise_construct_t { }; -//constexpr +#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_UTILITY) extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t(); +#else +constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t(); +#endif template <class _T1, class _T2> struct _LIBCPP_VISIBLE pair @@ -221,7 +224,7 @@ struct _LIBCPP_VISIBLE pair // pair(const pair&) = default; // pair(pair&&) = default; - _LIBCPP_INLINE_VISIBILITY pair() : first(), second() {} + _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR pair() : first(), second() {} _LIBCPP_INLINE_VISIBILITY pair(const _T1& __x, const _T2& __y) : first(__x), second(__y) {} |
