Skip to content

[libc++][NFC] Use __copy_cv to implement __apply_cv #86477

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.

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
merged 1 commit into from
Mar 29, 2024
Merged
Changes from all commits
Commits
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
50 changes: 5 additions & 45 deletions libcxx/include/__type_traits/apply_cv.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,64 +10,24 @@
#define _LIBCPP___TYPE_TRAITS_APPLY_CV_H

#include <__config>
#include <__type_traits/is_const.h>
#include <__type_traits/is_volatile.h>
#include <__type_traits/remove_reference.h>
#include <__type_traits/copy_cv.h>

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
#endif

_LIBCPP_BEGIN_NAMESPACE_STD

template <class _Tp,
bool = is_const<__libcpp_remove_reference_t<_Tp> >::value,
bool = is_volatile<__libcpp_remove_reference_t<_Tp> >::value>
struct __apply_cv_impl {
template <class _Up>
using __apply _LIBCPP_NODEBUG = _Up;
};

template <class _Tp>
struct __apply_cv_impl<_Tp, true, false> {
template <class _Up>
using __apply _LIBCPP_NODEBUG = const _Up;
};

template <class _Tp>
struct __apply_cv_impl<_Tp, false, true> {
template <class _Up>
using __apply _LIBCPP_NODEBUG = volatile _Up;
};

template <class _Tp>
struct __apply_cv_impl<_Tp, true, true> {
template <class _Up>
using __apply _LIBCPP_NODEBUG = const volatile _Up;
};

template <class _Tp>
struct __apply_cv_impl<_Tp&, false, false> {
template <class _Up>
using __apply _LIBCPP_NODEBUG = _Up&;
};

template <class _Tp>
struct __apply_cv_impl<_Tp&, true, false> {
template <class _Up>
using __apply _LIBCPP_NODEBUG = const _Up&;
};

template <class _Tp>
struct __apply_cv_impl<_Tp&, false, true> {
struct __apply_cv_impl {
template <class _Up>
using __apply _LIBCPP_NODEBUG = volatile _Up&;
using __apply _LIBCPP_NODEBUG = __copy_cv_t<_Tp, _Up>;
};

template <class _Tp>
struct __apply_cv_impl<_Tp&, true, true> {
struct __apply_cv_impl<_Tp&> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An improvement to __copy_cv_ref_t we could maybe do is

template <bool _Ref>
struct __copy_cv_ref_impl;

template <>
struct __copy_cv_ref_impl<true> {
  template <class _Tp>
  using __apply _LIBCPP_NODEBUG = _Tp&;
};

template <>
struct __copy_cv_ref_impl<false> {
  template <class _Tp>
  using __apply _LIBCPP_NODEBUG = _Tp;
};

template <class _Tp>
using __copy_cvref_t = typename __copy_cv_ref_impl<is_lvalue_reference_v<_Tp>>::template __apply<_Tp>;

template <class _Up>
using __apply _LIBCPP_NODEBUG = const volatile _Up&;
using __apply _LIBCPP_NODEBUG = __copy_cv_t<_Tp, _Up>&;
};

template <class _Tp, class _Up>
Expand Down