From 011d8001e295ab428f3d73602d2e4fa0b248efc4 Mon Sep 17 00:00:00 2001 From: theraven Date: Thu, 3 May 2012 17:44:07 +0000 Subject: Import new version of libc++. Among other improvements, this comes with an header that works with clang 3.1 (and, importantly, the pre-3.1 snapshot currently in head) --- contrib/libc++/include/utility | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'contrib/libc++/include/utility') 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 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) {} -- cgit v1.1