diff options
| author | theraven <theraven@FreeBSD.org> | 2012-03-13 14:09:15 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2012-03-13 14:09:15 +0000 |
| commit | baa75b9984d33ea49ffb76a73507b64d879166cc (patch) | |
| tree | 491848d33dbdf1751fd52f321d3fbf70a8e616f2 /include/exception | |
| parent | d8f28ec8a2faabad3aabb9f7a26755971424ef05 (diff) | |
| download | FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.zip FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.tar.gz | |
Import new version of libc++ into vendor branch.
Approved by: dim (mentor)
Diffstat (limited to 'include/exception')
| -rw-r--r-- | include/exception | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/exception b/include/exception index 0a747f5..f7c3b70 100644 --- a/include/exception +++ b/include/exception @@ -132,7 +132,7 @@ public: ~exception_ptr() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY - // explicit + _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __ptr_ != nullptr;} friend _LIBCPP_INLINE_VISIBILITY @@ -146,9 +146,9 @@ public: _ATTRIBUTE(noreturn) friend void rethrow_exception(exception_ptr); }; -template<class _E> +template<class _Ep> exception_ptr -make_exception_ptr(_E __e) _NOEXCEPT +make_exception_ptr(_Ep __e) _NOEXCEPT { #ifndef _LIBCPP_NO_EXCEPTIONS try @@ -224,11 +224,11 @@ throw_with_nested (_Tp& __t, typename enable_if< #endif } -template <class _E> +template <class _Ep> inline _LIBCPP_INLINE_VISIBILITY void -rethrow_if_nested(const _E& __e, typename enable_if< - is_polymorphic<_E>::value +rethrow_if_nested(const _Ep& __e, typename enable_if< + is_polymorphic<_Ep>::value >::type* = 0) { const nested_exception* __nep = dynamic_cast<const nested_exception*>(&__e); @@ -236,11 +236,11 @@ rethrow_if_nested(const _E& __e, typename enable_if< __nep->rethrow_nested(); } -template <class _E> +template <class _Ep> inline _LIBCPP_INLINE_VISIBILITY void -rethrow_if_nested(const _E& __e, typename enable_if< - !is_polymorphic<_E>::value +rethrow_if_nested(const _Ep&, typename enable_if< + !is_polymorphic<_Ep>::value >::type* = 0) { } |
