Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions stl/inc/type_traits
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ _MEMBER_CALL_CV_REF_NOEXCEPT(_IS_MEMFUNPTR)
_CLASS_DEFINE_CV_REF_NOEXCEPT(_IS_MEMFUNPTR_ELLIPSIS)
#undef _IS_MEMFUNPTR_ELLIPSIS

#if _HAS_CXX23 && !defined(__clang__) // TRANSITION, DevCom-10107077, Clang has not implemented Deducing this
#if _HAS_CXX23
#define _IS_MEMFUNPTR_EXPLICIT_THIS_GUIDES(CALL_OPT, CV_OPT, REF_OPT, NOEXCEPT_OPT) \
template <class _Ret, class _Self, class... _Args> \
struct _Is_memfunptr<_Ret(CALL_OPT*)(_Self, _Args...) NOEXCEPT_OPT> { \
Expand All @@ -553,7 +553,7 @@ _NON_MEMBER_CALL(_IS_MEMFUNPTR_EXPLICIT_THIS_GUIDES, , , noexcept)
#endif // defined(__cpp_noexcept_function_type)

#undef _IS_MEMFUNPTR_EXPLICIT_THIS_GUIDES
#endif // _HAS_CXX23 && !defined(__clang__)
#endif // _HAS_CXX23

#ifdef __clang__
_EXPORT_STD template <class _Ty>
Expand Down
8 changes: 2 additions & 6 deletions tests/std/tests/P0433R2_deduction_guides/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@
#include <valarray>
#include <vector>

#if _HAS_CXX23 && !defined(__clang__) // TRANSITION, DevCom-10107077, Clang has not implemented Deducing this
#define HAS_EXPLICIT_THIS_PARAMETER
#endif // _HAS_CXX23 && !defined(__clang__)

using namespace std;

template <typename T>
Expand Down Expand Up @@ -327,7 +323,7 @@ void test_function_wrapper() {
static_assert(is_same_v<decltype(f9), F<double(const double&, const double&)>>);
static_assert(is_same_v<decltype(f10), F<int(int, int)>>);

#ifdef HAS_EXPLICIT_THIS_PARAMETER
#if _HAS_CXX23
struct ExplicitThisByVal {
void operator()(this ExplicitThisByVal, char) {}
};
Expand Down Expand Up @@ -409,7 +405,7 @@ void test_function_wrapper() {
static_assert(is_same_v<decltype(f25), F<float(double)>>);
static_assert(is_same_v<decltype(f26), F<float(double)>>);
static_assert(is_same_v<decltype(f27), F<float(double)>>);
#endif // HAS_EXPLICIT_THIS_PARAMETER
#endif // _HAS_CXX23
}

void test_searchers() {
Expand Down