Skip to content

🐛 Small fixes for CX_VALUE and friends #247

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
lukevalenty merged 1 commit into from
Jul 10, 2025
Merged

🐛 Small fixes for CX_VALUE and friends #247

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
12 changes: 8 additions & 4 deletions include/stdx/utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ template <typename T> constexpr auto is_ct_v<T const> = is_ct_v<T>;

#ifndef CX_VALUE
#define CX_VALUE(...) \
[&]() constexpr { \
[]() constexpr { \
STDX_PRAGMA(diagnostic push) \
STDX_PRAGMA(diagnostic ignored "-Wold-style-cast") \
STDX_PRAGMA(diagnostic ignored "-Wunused-value") \
Expand Down Expand Up @@ -274,7 +274,10 @@ template <typename T> constexpr auto is_ct_v<T const> = is_ct_v<T>;
}([&] { return X; })

#ifdef __clang__
#define CX_DETECT(X) std::is_empty_v<decltype(CX_VALUE(X))>
#define CX_DETECT(X) \
std::is_empty_v<decltype([&] { \
return (X) + ::stdx::cxv_detail::type_val{}; \
})>
#else
namespace stdx {
inline namespace v1 {
Expand All @@ -290,10 +293,11 @@ constexpr auto cx_detect1(auto) { return 0; }
#endif

#define CX_WRAP(X) \
[&]<typename F>(F f) { \
[&](auto f) { \
STDX_PRAGMA(diagnostic push) \
STDX_PRAGMA(diagnostic ignored "-Wold-style-cast") \
if constexpr (::stdx::is_cx_value_v<std::invoke_result_t<F>>) { \
if constexpr (::stdx::is_cx_value_v< \
std::invoke_result_t<decltype(f)>>) { \
return f(); \
} else if constexpr (CX_DETECT(X)) { \
if constexpr (decltype(::stdx::cxv_detail::is_type< \
Expand Down