Skip to content

Remove _NOEXCEPT macro in favor of noexcept in libcu++ #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miscco merged 1 commit into from
Aug 21, 2023
Merged

Remove _NOEXCEPT macro in favor of noexcept in libcu++ #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions libcudacxx/include/cuda/std/detail/libcxx/include/__bit_reference
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public:
_LIBCUDACXX_INLINE_VISIBILITY
__bit_reference(const __bit_reference&) = default;

_LIBCUDACXX_INLINE_VISIBILITY operator bool() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY operator bool() const noexcept
{return static_cast<bool>(*__seg_ & __mask_);}
_LIBCUDACXX_INLINE_VISIBILITY bool operator ~() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY bool operator ~() const noexcept
{return !static_cast<bool>(*this);}

_LIBCUDACXX_INLINE_VISIBILITY
__bit_reference& operator=(bool __x) _NOEXCEPT
__bit_reference& operator=(bool __x) noexcept
{
if (__x)
*__seg_ |= __mask_;
Expand All @@ -66,15 +66,15 @@ public:
}

_LIBCUDACXX_INLINE_VISIBILITY
__bit_reference& operator=(const __bit_reference& __x) _NOEXCEPT
__bit_reference& operator=(const __bit_reference& __x) noexcept
{return operator=(static_cast<bool>(__x));}

_LIBCUDACXX_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY void flip() noexcept {*__seg_ ^= __mask_;}
_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const noexcept
{return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
private:
_LIBCUDACXX_INLINE_VISIBILITY
__bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
__bit_reference(__storage_pointer __s, __storage_type __m) noexcept
: __seg_(__s), __mask_(__m) {}
};

Expand All @@ -86,7 +86,7 @@ class __bit_reference<_Cp, false>
template <class _Cp>
inline _LIBCUDACXX_INLINE_VISIBILITY
void
swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) noexcept
{
bool __t = __x;
__x = __y;
Expand All @@ -96,7 +96,7 @@ swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
template <class _Cp, class _Dp>
inline _LIBCUDACXX_INLINE_VISIBILITY
void
swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) noexcept
{
bool __t = __x;
__x = __y;
Expand All @@ -106,7 +106,7 @@ swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
template <class _Cp>
inline _LIBCUDACXX_INLINE_VISIBILITY
void
swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
swap(__bit_reference<_Cp> __x, bool& __y) noexcept
{
bool __t = __x;
__x = __y;
Expand All @@ -116,7 +116,7 @@ swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
template <class _Cp>
inline _LIBCUDACXX_INLINE_VISIBILITY
void
swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT
swap(bool& __x, __bit_reference<_Cp> __y) noexcept
{
bool __t = __x;
__x = __y;
Expand All @@ -139,18 +139,18 @@ public:
__bit_const_reference(const __bit_const_reference&) = default;

_LIBCUDACXX_INLINE_VISIBILITY
__bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT
__bit_const_reference(const __bit_reference<_Cp>& __x) noexcept
: __seg_(__x.__seg_), __mask_(__x.__mask_) {}

_LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR operator bool() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_CONSTEXPR operator bool() const noexcept
{return static_cast<bool>(*__seg_ & __mask_);}

_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const noexcept
{return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__libcpp_ctz(__mask_)));}
private:
_LIBCUDACXX_INLINE_VISIBILITY
_LIBCUDACXX_CONSTEXPR
__bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
__bit_const_reference(__storage_pointer __s, __storage_type __m) noexcept
: __seg_(__s), __mask_(__m) {}

__bit_const_reference& operator=(const __bit_const_reference&) = delete;
Expand Down Expand Up @@ -1108,7 +1108,7 @@ private:
unsigned __ctz_;

public:
_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator() _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator() noexcept
#if _LIBCUDACXX_STD_VER > 11
: __seg_(nullptr), __ctz_(0)
#endif
Expand All @@ -1118,10 +1118,10 @@ public:
_If<_IsConst, __bit_iterator<_Cp, false>, struct __private_nat>;

_LIBCUDACXX_INLINE_VISIBILITY
__bit_iterator(const __type_for_copy_to_const& __it) _NOEXCEPT
__bit_iterator(const __type_for_copy_to_const& __it) noexcept
: __seg_(__it.__seg_), __ctz_(__it.__ctz_) {}

_LIBCUDACXX_INLINE_VISIBILITY reference operator*() const _NOEXCEPT
_LIBCUDACXX_INLINE_VISIBILITY reference operator*() const noexcept
{return reference(__seg_, __storage_type(1) << __ctz_);}

_LIBCUDACXX_INLINE_VISIBILITY __bit_iterator& operator++()
Expand Down Expand Up @@ -1222,7 +1222,7 @@ public:

private:
_LIBCUDACXX_INLINE_VISIBILITY
__bit_iterator(__storage_pointer __s, unsigned __ctz) _NOEXCEPT
__bit_iterator(__storage_pointer __s, unsigned __ctz) noexcept
: __seg_(__s), __ctz_(__ctz) {}

friend typename _Cp::__self;
Expand Down
6 changes: 3 additions & 3 deletions libcudacxx/include/cuda/std/detail/libcxx/include/__cuda/chrono.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ _LIBCUDACXX_BEGIN_NAMESPACE_STD
namespace chrono {

inline _LIBCUDACXX_INLINE_VISIBILITY
system_clock::time_point system_clock::now() _NOEXCEPT
system_clock::time_point system_clock::now() noexcept
{
NV_DISPATCH_TARGET(
NV_IS_DEVICE, (
Expand All @@ -44,13 +44,13 @@ NV_IS_HOST, (
}

inline _LIBCUDACXX_INLINE_VISIBILITY
time_t system_clock::to_time_t(const system_clock::time_point& __t) _NOEXCEPT
time_t system_clock::to_time_t(const system_clock::time_point& __t) noexcept
{
return time_t(duration_cast<seconds>(__t.time_since_epoch()).count());
}

inline _LIBCUDACXX_INLINE_VISIBILITY
system_clock::time_point system_clock::from_time_t(time_t __t) _NOEXCEPT
system_clock::time_point system_clock::from_time_t(time_t __t) noexcept
{
return time_point(seconds(__t));;
}
Expand Down
Loading