maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Appy constexpr to <memory>. Picked up a few missing noexcepts as well. 

llvm-svn: 159902
This commit is contained in:
Howard Hinnant 2012-07-07 20:56:04 +00:00
parent bfa7990b5a
commit c0937e8add
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libcxx/include/memory
View File

@ -2467,7 +2467,11 @@ struct __same_or_less_cv_qualified<_Ptr1, _Ptr2, true>
template <class _Tp> template <class _Tp>
struct _LIBCPP_VISIBLE default_delete struct _LIBCPP_VISIBLE default_delete
{ {
_LIBCPP_INLINE_VISIBILITY default_delete() _NOEXCEPT {} #ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
#else
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
#endif
template <class _Up> template <class _Up>
_LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up>&, _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up>&,
typename enable_if<is_convertible<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {} typename enable_if<is_convertible<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
@ -2482,7 +2486,11 @@ template <class _Tp>
struct _LIBCPP_VISIBLE default_delete<_Tp[]> struct _LIBCPP_VISIBLE default_delete<_Tp[]>
{ {
public: public:
_LIBCPP_INLINE_VISIBILITY default_delete() _NOEXCEPT {} #ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
#else
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
#endif
template <class _Up> template <class _Up>
_LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up[]>&, _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up[]>&,
typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {} typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
@ -2520,13 +2528,13 @@ private:
typedef typename remove_reference<deleter_type>::type& _Dp_reference; typedef typename remove_reference<deleter_type>::type& _Dp_reference;
typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference; typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
public: public:
_LIBCPP_INLINE_VISIBILITY unique_ptr() _NOEXCEPT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
: __ptr_(pointer()) : __ptr_(pointer())
{ {
static_assert(!is_pointer<deleter_type>::value, static_assert(!is_pointer<deleter_type>::value,
"unique_ptr constructed with null function pointer deleter"); "unique_ptr constructed with null function pointer deleter");
} }
_LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t) _NOEXCEPT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
: __ptr_(pointer()) : __ptr_(pointer())
{ {
static_assert(!is_pointer<deleter_type>::value, static_assert(!is_pointer<deleter_type>::value,
@ -2699,13 +2707,13 @@ private:
typedef typename remove_reference<deleter_type>::type& _Dp_reference; typedef typename remove_reference<deleter_type>::type& _Dp_reference;
typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference; typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
public: public:
_LIBCPP_INLINE_VISIBILITY unique_ptr() _NOEXCEPT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
: __ptr_(pointer()) : __ptr_(pointer())
{ {
static_assert(!is_pointer<deleter_type>::value, static_assert(!is_pointer<deleter_type>::value,
"unique_ptr constructed with null function pointer deleter"); "unique_ptr constructed with null function pointer deleter");
} }
_LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t) _NOEXCEPT _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
: __ptr_(pointer()) : __ptr_(pointer())
{ {
static_assert(!is_pointer<deleter_type>::value, static_assert(!is_pointer<deleter_type>::value,
@ -2955,7 +2963,7 @@ operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {re
template <class _T1, class _D1> template <class _T1, class _D1>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
bool bool
operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
{ {
return !__x; return !__x;
} }
@ -2963,7 +2971,7 @@ operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t)
template <class _T1, class _D1> template <class _T1, class _D1>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
bool bool
operator==(nullptr_t, const unique_ptr<_T1, _D1>& __x) operator==(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
{ {
return !__x; return !__x;
} }
@ -2971,7 +2979,7 @@ operator==(nullptr_t, const unique_ptr<_T1, _D1>& __x)
template <class _T1, class _D1> template <class _T1, class _D1>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
bool bool
operator!=(const unique_ptr<_T1, _D1>& __x, nullptr_t) operator!=(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
{ {
return static_cast<bool>(__x); return static_cast<bool>(__x);
} }
@ -2979,7 +2987,7 @@ operator!=(const unique_ptr<_T1, _D1>& __x, nullptr_t)
template <class _T1, class _D1> template <class _T1, class _D1>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
bool bool
operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
{ {
return static_cast<bool>(__x); return static_cast<bool>(__x);
} }
@ -3736,8 +3744,8 @@ private:
struct __nat {int __for_bool_;}; struct __nat {int __for_bool_;};
public: public:
shared_ptr() _NOEXCEPT; _LIBCPP_CONSTEXPR shared_ptr() _NOEXCEPT;
shared_ptr(nullptr_t) _NOEXCEPT; _LIBCPP_CONSTEXPR shared_ptr(nullptr_t) _NOEXCEPT;
template<class _Yp, template<class _Yp,
class = typename enable_if class = typename enable_if
< <
@ -3997,6 +4005,7 @@ private:
template<class _Tp> template<class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
shared_ptr<_Tp>::shared_ptr() _NOEXCEPT shared_ptr<_Tp>::shared_ptr() _NOEXCEPT
: __ptr_(0), : __ptr_(0),
__cntrl_(0) __cntrl_(0)
@ -4005,6 +4014,7 @@ shared_ptr<_Tp>::shared_ptr() _NOEXCEPT
template<class _Tp> template<class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
shared_ptr<_Tp>::shared_ptr(nullptr_t) _NOEXCEPT shared_ptr<_Tp>::shared_ptr(nullptr_t) _NOEXCEPT
: __ptr_(0), : __ptr_(0),
__cntrl_(0) __cntrl_(0)
@ -4895,7 +4905,7 @@ private:
__shared_weak_count* __cntrl_; __shared_weak_count* __cntrl_;
public: public:
weak_ptr() _NOEXCEPT; _LIBCPP_CONSTEXPR weak_ptr() _NOEXCEPT;
template<class _Yp> weak_ptr(shared_ptr<_Yp> const& __r, template<class _Yp> weak_ptr(shared_ptr<_Yp> const& __r,
typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0) typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
_NOEXCEPT; _NOEXCEPT;
@ -4967,6 +4977,7 @@ public:
template<class _Tp> template<class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
_LIBCPP_CONSTEXPR
weak_ptr<_Tp>::weak_ptr() _NOEXCEPT weak_ptr<_Tp>::weak_ptr() _NOEXCEPT
: __ptr_(0), : __ptr_(0),
__cntrl_(0) __cntrl_(0)
@ -5197,7 +5208,7 @@ class _LIBCPP_VISIBLE enable_shared_from_this
{ {
mutable weak_ptr<_Tp> __weak_this_; mutable weak_ptr<_Tp> __weak_this_;
protected: protected:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
enable_shared_from_this() _NOEXCEPT {} enable_shared_from_this() _NOEXCEPT {}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
enable_shared_from_this(enable_shared_from_this const&) _NOEXCEPT {} enable_shared_from_this(enable_shared_from_this const&) _NOEXCEPT {}

4
libcxx/include/tuple
View File

@ -130,7 +130,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
struct _LIBCPP_VISIBLE allocator_arg_t { }; struct _LIBCPP_VISIBLE allocator_arg_t { };
#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MEMORY)
extern const allocator_arg_t allocator_arg; extern const allocator_arg_t allocator_arg;
#else
constexpr allocator_arg_t allocator_arg = allocator_arg_t();
#endif
// uses_allocator // uses_allocator

1
libcxx/src/memory.cpp
View File

@ -7,6 +7,7 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#define _LIBCPP_BUILDING_MEMORY
#include "memory" #include "memory"
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD