Skip to content

Commit a1e77d2

Browse files
committed
Addressed review comments
1 parent 65ebe1e commit a1e77d2

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

libcxx/include/__config

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1216,18 +1216,14 @@ typedef __char32_t char32_t;
12161216
# endif
12171217

12181218
// TODO(LLVM 22): Remove this macro once LLVM19 support ends.
1219-
# if __has_builtin(__reference_constructs_from_temporary) || \
1220-
(defined(_LIBCPP_CLANG_VER) && \
1221-
((!defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1901) || (defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1900)))
1219+
# if __has_builtin(__reference_constructs_from_temporary)
12221220
# define _LIBCPP_HAS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY 1
12231221
# else
12241222
# define _LIBCPP_HAS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY 0
12251223
# endif
12261224

12271225
// TODO(LLVM 22): Remove this macro once LLVM19 support ends.
1228-
# if __has_builtin(__reference_converts_from_temporary) || \
1229-
(defined(_LIBCPP_CLANG_VER) && \
1230-
((!defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 1901) || (defined(__ANDROID__) && _LIBCPP_CLANG_VER >= 2000)))
1226+
# if __has_builtin(__reference_converts_from_temporary)
12311227
# define _LIBCPP_HAS_REFERENCE_CONVERTS_FROM_TEMPORARY 1
12321228
# else
12331229
# define _LIBCPP_HAS_REFERENCE_CONVERTS_FROM_TEMPORARY 0

libcxx/include/__type_traits/reference_constructs_from_temporary.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
#if _LIBCPP_HAS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY
2222

23-
template <class _Tp, class _Up>
24-
const bool __reference_constructs_from_temporary_v = __reference_constructs_from_temporary(_Tp, _Up);
25-
2623
# if _LIBCPP_STD_VER >= 23
2724

2825
template <class _Tp, class _Up>
@@ -31,7 +28,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_NO_SPECIALIZATIONS reference_constructs_from
3128

3229
template <class _Tp, class _Up>
3330
_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool reference_constructs_from_temporary_v =
34-
__reference_constructs_from_temporary_v<_Tp, _Up>;
31+
__reference_constructs_from_temporary(_Tp, _Up);
3532

3633
# endif
3734

libcxx/include/__type_traits/reference_converts_from_temporary.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
2020

2121
#if _LIBCPP_HAS_REFERENCE_CONVERTS_FROM_TEMPORARY
2222

23-
template <class _Tp, class _Up>
24-
const bool __reference_converts_from_temporary_v = __reference_converts_from_temporary(_Tp, _Up);
25-
2623
# if _LIBCPP_STD_VER >= 23
2724

2825
template <class _Tp, class _Up>
@@ -31,7 +28,7 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_NO_SPECIALIZATIONS reference_converts_from_t
3128

3229
template <class _Tp, class _Up>
3330
_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool reference_converts_from_temporary_v =
34-
__reference_converts_from_temporary_v<_Tp, _Up>;
31+
__reference_converts_from_temporary(_Tp, _Up);
3532

3633
# endif
3734

libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/reference_constructs_from_temporary.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// REQUIRES: std-at-least-c++23
1010

1111
// These compilers don't support std::reference_converts_from_temporary yet.
12-
// UNSUPPORTED: apple-clang-15, apple-clang-16
12+
// UNSUPPORTED: android, apple-clang-15, apple-clang-16, clang-19.1
1313

1414
// <type_traits>
1515

libcxx/test/std/utilities/meta/meta.unary/meta.unary.prop/reference_converts_from_temporary.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// REQUIRES: std-at-least-c++23
1010

1111
// These compilers don't support std::reference_converts_from_temporary yet.
12-
// UNSUPPORTED: android && clang-19.0, apple-clang-15, apple-clang-16, clang-18
12+
// UNSUPPORTED: android, apple-clang-15, apple-clang-16, clang-18, clang-19.1
1313

1414
// <type_traits>
1515

0 commit comments

Comments
 (0)