Skip to content

Commit 1121d64

Browse files
philnik777philnik777
authored
[libc++][NFC] Merge add_{r,l}value_reference.h (#147022)
The implementation is now quite simple, so it doesn't make a ton of sense to have these in separate headers.
1 parent bdbac2b commit 1121d64

19 files changed

+42
-85
lines changed

‎libcxx/include/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,9 +778,8 @@ set(files
778778
__tuple/tuple_size.h
779779
__tuple/tuple_types.h
780780
__type_traits/add_cv_quals.h
781-
__type_traits/add_lvalue_reference.h
782781
__type_traits/add_pointer.h
783-
__type_traits/add_rvalue_reference.h
782+
__type_traits/add_reference.h
784783
__type_traits/aligned_storage.h
785784
__type_traits/aligned_union.h
786785
__type_traits/alignment_of.h

‎libcxx/include/__concepts/common_with.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <__concepts/common_reference_with.h>
1313
#include <__concepts/same_as.h>
1414
#include <__config>
15-
#include <__type_traits/add_lvalue_reference.h>
15+
#include <__type_traits/add_reference.h>
1616
#include <__type_traits/common_reference.h>
1717
#include <__type_traits/common_type.h>
1818
#include <__utility/declval.h>

‎libcxx/include/__memory/shared_ptr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <__memory/shared_count.h>
3535
#include <__memory/uninitialized_algorithms.h>
3636
#include <__memory/unique_ptr.h>
37-
#include <__type_traits/add_lvalue_reference.h>
37+
#include <__type_traits/add_reference.h>
3838
#include <__type_traits/conditional.h>
3939
#include <__type_traits/conjunction.h>
4040
#include <__type_traits/disjunction.h>

‎libcxx/include/__memory/unique_ptr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <__memory/auto_ptr.h>
2525
#include <__memory/compressed_pair.h>
2626
#include <__memory/pointer_traits.h>
27-
#include <__type_traits/add_lvalue_reference.h>
27+
#include <__type_traits/add_reference.h>
2828
#include <__type_traits/common_type.h>
2929
#include <__type_traits/conditional.h>
3030
#include <__type_traits/dependent_type.h>

libcxx/include/__type_traits/add_lvalue_reference.h renamed to libcxx/include/__type_traits/add_reference.h

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
10-
#define _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
9+
#ifndef _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H
10+
#define _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H
1111

1212
#include <__config>
1313

@@ -35,6 +35,24 @@ template <class _Tp>
3535
using add_lvalue_reference_t = __add_lvalue_reference_t<_Tp>;
3636
#endif
3737

38+
template <class _Tp>
39+
struct _LIBCPP_NO_SPECIALIZATIONS add_rvalue_reference {
40+
using type _LIBCPP_NODEBUG = __add_rvalue_reference(_Tp);
41+
};
42+
43+
#ifdef _LIBCPP_COMPILER_GCC
44+
template <class _Tp>
45+
using __add_rvalue_reference_t _LIBCPP_NODEBUG = typename add_rvalue_reference<_Tp>::type;
46+
#else
47+
template <class _Tp>
48+
using __add_rvalue_reference_t _LIBCPP_NODEBUG = __add_rvalue_reference(_Tp);
49+
#endif
50+
51+
#if _LIBCPP_STD_VER >= 14
52+
template <class _Tp>
53+
using add_rvalue_reference_t = __add_rvalue_reference_t<_Tp>;
54+
#endif
55+
3856
_LIBCPP_END_NAMESPACE_STD
3957

40-
#endif // _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
58+
#endif // _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H

‎libcxx/include/__type_traits/add_rvalue_reference.h‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎libcxx/include/__type_traits/copy_cvref.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#define _LIBCPP___TYPE_TRAITS_COPY_CVREF_H
1111

1212
#include <__config>
13-
#include <__type_traits/add_lvalue_reference.h>
14-
#include <__type_traits/add_rvalue_reference.h>
13+
#include <__type_traits/add_reference.h>
1514
#include <__type_traits/copy_cv.h>
1615

1716
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__type_traits/is_assignable.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#define _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H
1111

1212
#include <__config>
13-
#include <__type_traits/add_lvalue_reference.h>
14-
#include <__type_traits/add_rvalue_reference.h>
13+
#include <__type_traits/add_reference.h>
1514
#include <__type_traits/integral_constant.h>
1615

1716
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

‎libcxx/include/__type_traits/is_bounded_array.h‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#define _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
1111

1212
#include <__config>
13-
#include <__cstddef/size_t.h>
1413
#include <__type_traits/integral_constant.h>
1514

1615
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -19,26 +18,16 @@
1918

2019
_LIBCPP_BEGIN_NAMESPACE_STD
2120

22-
template <class>
23-
inline const bool __is_bounded_array_v = false;
24-
template <class _Tp, size_t _Np>
25-
inline const bool __is_bounded_array_v<_Tp[_Np]> = true;
21+
template <class _Tp>
22+
inline const bool __is_bounded_array_v = __is_bounded_array(_Tp);
2623

2724
#if _LIBCPP_STD_VER >= 20
2825

29-
template <class>
30-
struct _LIBCPP_NO_SPECIALIZATIONS is_bounded_array : false_type {};
31-
32-
_LIBCPP_DIAGNOSTIC_PUSH
33-
# if __has_warning("-Winvalid-specialization")
34-
_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Winvalid-specialization")
35-
# endif
36-
template <class _Tp, size_t _Np>
37-
struct is_bounded_array<_Tp[_Np]> : true_type {};
38-
_LIBCPP_DIAGNOSTIC_POP
26+
template <class _Tp>
27+
struct _LIBCPP_NO_SPECIALIZATIONS is_bounded_array : bool_constant<__is_bounded_array(_Tp)> {};
3928

4029
template <class _Tp>
41-
_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_bounded_array_v = is_bounded_array<_Tp>::value;
30+
_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_bounded_array_v = __is_bounded_array(_Tp);
4231

4332
#endif
4433

‎libcxx/include/__type_traits/is_constructible.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#define _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
1111

1212
#include <__config>
13-
#include <__type_traits/add_lvalue_reference.h>
14-
#include <__type_traits/add_rvalue_reference.h>
13+
#include <__type_traits/add_reference.h>
1514
#include <__type_traits/integral_constant.h>
1615

1716
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

0 commit comments

Comments
 (0)