refactor: use concepts instead of SFINAE (#1652)

This commit is contained in:
oltolm 2025-08-25 01:33:46 +02:00 committed by GitHub
parent aeb3154257
commit de4bf7c2c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 71 additions and 70 deletions

View file

@ -106,7 +106,7 @@ bool gameProfile_loadIntegerOption(IniParser* iniParser, const char* optionName,
template <typename T> template <typename T>
bool gameProfile_loadIntegerOption(IniParser& iniParser, const char* optionName, T& option, T minVal, T maxVal) bool gameProfile_loadIntegerOption(IniParser& iniParser, const char* optionName, T& option, T minVal, T maxVal)
{ {
static_assert(std::is_integral<T>::value); static_assert(std::is_integral_v<T>);
auto option_value = iniParser.FindOption(optionName); auto option_value = iniParser.FindOption(optionName);
if (!option_value) if (!option_value)
return false; return false;
@ -133,7 +133,7 @@ bool gameProfile_loadIntegerOption(IniParser& iniParser, const char* optionName,
template<typename T> template<typename T>
bool gameProfile_loadEnumOption(IniParser& iniParser, const char* optionName, T& option) bool gameProfile_loadEnumOption(IniParser& iniParser, const char* optionName, T& option)
{ {
static_assert(std::is_enum<T>::value); static_assert(std::is_enum_v<T>);
auto option_value = iniParser.FindOption(optionName); auto option_value = iniParser.FindOption(optionName);
if (!option_value) if (!option_value)
return false; return false;

View file

@ -25,7 +25,7 @@ class IntervalTree2
// static TNodeObject* Split(TNodeObject* nodeObject, TRangeData firstRangeBegin, TRangeData firstRangeEnd, TRangeData secondRangeBegin, TRangeData secondRangeEnd) // static TNodeObject* Split(TNodeObject* nodeObject, TRangeData firstRangeBegin, TRangeData firstRangeEnd, TRangeData secondRangeBegin, TRangeData secondRangeEnd)
// Cut a hole into an existing range and split it in two. Should return the newly created node object after the hole // Cut a hole into an existing range and split it in two. Should return the newly created node object after the hole
static_assert(std::is_pointer<TNodeObject>::value == false, "TNodeObject must be a non-pointer type"); static_assert(!std::is_pointer_v<TNodeObject>, "TNodeObject must be a non-pointer type");
struct InternalRange struct InternalRange
{ {

View file

@ -176,14 +176,14 @@ void cafeExportCallWrapper(PPCInterpreter_t* hCPU)
if(cemuLog_advancedPPCLoggingEnabled()) if(cemuLog_advancedPPCLoggingEnabled())
{ {
MPTR threadMPTR = memory_getVirtualOffsetFromPointer(coreinit::OSGetCurrentThread()); MPTR threadMPTR = memory_getVirtualOffsetFromPointer(coreinit::OSGetCurrentThread());
if constexpr (std::tuple_size<decltype(format_tup)>::value > 0) if constexpr (std::tuple_size_v<decltype(format_tup)> > 0)
shouldLog = cemuLog_log(TLogType, "{}.{}{} # LR: {:#x} | Thread: {:#x}", TNames::GetLib(), TNames::GetFunc(), format_tup, hCPU->spr.LR, threadMPTR); shouldLog = cemuLog_log(TLogType, "{}.{}{} # LR: {:#x} | Thread: {:#x}", TNames::GetLib(), TNames::GetFunc(), format_tup, hCPU->spr.LR, threadMPTR);
else else
shouldLog = cemuLog_log(TLogType, "{}.{}() # LR: {:#x} | Thread: {:#x}", TNames::GetLib(), TNames::GetFunc(), hCPU->spr.LR, threadMPTR); shouldLog = cemuLog_log(TLogType, "{}.{}() # LR: {:#x} | Thread: {:#x}", TNames::GetLib(), TNames::GetFunc(), hCPU->spr.LR, threadMPTR);
} }
else else
{ {
if constexpr (std::tuple_size<decltype(format_tup)>::value > 0) if constexpr (std::tuple_size_v<decltype(format_tup)> > 0)
{ {
shouldLog = cemuLog_log(TLogType, "{}.{}{}", TNames::GetLib(), TNames::GetFunc(), format_tup); shouldLog = cemuLog_log(TLogType, "{}.{}{}", TNames::GetLib(), TNames::GetFunc(), format_tup);
} }
@ -192,7 +192,7 @@ void cafeExportCallWrapper(PPCInterpreter_t* hCPU)
} }
} }
if constexpr (!std::is_void<decltype(std::apply(fn, tup))>::value) if constexpr (!std::is_void_v<decltype(std::apply(fn, tup))>)
{ {
// has non-void return type // has non-void return type
decltype(auto) result = std::apply(fn, tup); decltype(auto) result = std::apply(fn, tup);

View file

@ -39,9 +39,9 @@ inline void gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const b
} }
template <typename T, typename ...Targs> template <typename T, typename ...Targs>
requires std::is_floating_point_v<T>
inline inline
typename std::enable_if< std::is_floating_point<T>::value, void>::type void gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
{ {
static_assert(sizeof(T) == sizeof(uint32)); static_assert(sizeof(T) == sizeof(uint32));
*writePtr = *(uint32*)&arg; *writePtr = *(uint32*)&arg;
@ -50,9 +50,9 @@ gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs
} }
template <typename T, typename ...Targs> template <typename T, typename ...Targs>
requires std::is_base_of_v<Latte::LATTEREG, T>
inline inline
typename std::enable_if< std::is_base_of<Latte::LATTEREG, T>::value, void>::type void gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
{ {
static_assert(sizeof(Latte::LATTEREG) == sizeof(uint32be)); static_assert(sizeof(Latte::LATTEREG) == sizeof(uint32be));
*writePtr = arg.getRawValue(); *writePtr = arg.getRawValue();
@ -61,9 +61,9 @@ gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs
} }
template <typename T, typename ...Targs> template <typename T, typename ...Targs>
requires (!std::is_base_of_v<Latte::LATTEREG, T>) && (!std::is_floating_point_v<T>)
inline inline
typename std::enable_if< !std::is_base_of<Latte::LATTEREG, T>::value && !std::is_floating_point<T>::value, void>::type void gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
gx2WriteGather_submit_(uint32 coreIndex, uint32be* writePtr, const T& arg, Targs... args)
{ {
*writePtr = arg; *writePtr = arg;
writePtr++; writePtr++;

View file

@ -37,7 +37,7 @@ public:
template<typename T> template<typename T>
T Evaluate(std::string_view expression) const T Evaluate(std::string_view expression) const
{ {
static_assert(std::is_arithmetic<T>::value, "type T must be an arithmetic type"); static_assert(std::is_arithmetic_v<T>, "type T must be an arithmetic type");
return (T)Evaluate(expression); return (T)Evaluate(expression);
} }

View file

@ -113,9 +113,8 @@ public:
operator void*() { return m_sysMem->GetPtr(); } operator void*() { return m_sysMem->GetPtr(); }
// for all arrays except bool // for all arrays except bool
template<class Q = T> T& operator[](int index)
typename std::enable_if< count != 1 && !std::is_same<Q, bool>::value, Q >::type& requires(count != 1) && (!std::is_same_v<T, bool>)
operator[](int index)
{ {
// return tmp data until we allocated in sys mem // return tmp data until we allocated in sys mem
if (m_sysMem.GetMPTR() == 0) if (m_sysMem.GetMPTR() == 0)
@ -125,7 +124,7 @@ public:
return m_sysMem[index]; return m_sysMem[index];
} }
private: private:
SysAllocator(uint32 memptr) SysAllocator(uint32 memptr)
: m_sysMem(memptr) : m_sysMem(memptr)
{} {}

View file

@ -22,7 +22,7 @@ constexpr T bswap(T i)
template <typename T> template <typename T>
constexpr T SwapEndian(T value) constexpr T SwapEndian(T value)
{ {
if constexpr (std::is_integral<T>::value) if constexpr (std::is_integral_v<T>)
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
if constexpr (sizeof(T) == sizeof(uint32_t)) if constexpr (sizeof(T) == sizeof(uint32_t))
@ -33,7 +33,7 @@ constexpr T SwapEndian(T value)
return (T)bswap((std::make_unsigned_t<T>)value); return (T)bswap((std::make_unsigned_t<T>)value);
} }
else if constexpr (std::is_floating_point<T>::value) else if constexpr (std::is_floating_point_v<T>)
{ {
if constexpr (sizeof(T) == sizeof(uint32_t)) if constexpr (sizeof(T) == sizeof(uint32_t))
{ {
@ -46,18 +46,18 @@ constexpr T SwapEndian(T value)
return *(T*)&tmp; return *(T*)&tmp;
} }
} }
else if constexpr (std::is_enum<T>::value) else if constexpr (std::is_enum_v<T>)
{ {
return (T)SwapEndian((std::underlying_type_t<T>)value); return (T)SwapEndian((std::underlying_type_t<T>)value);
} }
else if constexpr (std::is_base_of<Latte::LATTEREG, T>::value) else if constexpr (std::is_base_of_v<Latte::LATTEREG, T>)
{ {
const auto tmp = bswap<uint32_t>(*(uint32_t*)&value); const auto tmp = bswap<uint32_t>(*(uint32_t*)&value);
return *(T*)&tmp; return *(T*)&tmp;
} }
else else
{ {
static_assert(std::is_integral<T>::value, "unsupported betype specialization!"); static_assert(std::is_integral_v<T>, "unsupported betype specialization!");
} }
return value; return value;

View file

@ -10,63 +10,65 @@ struct EnableBitMaskOperators
}; };
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type requires EnableBitMaskOperators<TEnum>::enable
operator &(TEnum lhs, TEnum rhs) TEnum operator &(TEnum lhs, TEnum rhs)
{ {
return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) & static_cast<typename std::underlying_type<TEnum>::type>(rhs)); return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) & static_cast<typename std::underlying_type<TEnum>::type>(rhs));
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type requires EnableBitMaskOperators<TEnum>::enable
operator |(TEnum lhs, TEnum rhs) TEnum operator |(TEnum lhs, TEnum rhs)
{ {
return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) | static_cast<typename std::underlying_type<TEnum>::type>(rhs)); return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) | static_cast<typename std::underlying_type<TEnum>::type>(rhs));
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type requires EnableBitMaskOperators<TEnum>::enable
operator ^(TEnum lhs, TEnum rhs) TEnum operator ^(TEnum lhs, TEnum rhs)
{ {
return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) ^ static_cast<typename std::underlying_type<TEnum>::type>(rhs)); return static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) ^ static_cast<typename std::underlying_type<TEnum>::type>(rhs));
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type requires EnableBitMaskOperators<TEnum>::enable
operator ~(TEnum rhs) TEnum operator ~(TEnum rhs)
{ {
return static_cast<TEnum> (~static_cast<typename std::underlying_type<TEnum>::type>(rhs)); return static_cast<TEnum> (~static_cast<typename std::underlying_type<TEnum>::type>(rhs));
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type& requires EnableBitMaskOperators<TEnum>::enable
operator &=(TEnum& lhs, TEnum rhs) TEnum& operator &=(TEnum& lhs, TEnum rhs)
{ {
lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) & static_cast<typename std::underlying_type<TEnum>::type>(rhs)); lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) & static_cast<typename std::underlying_type<TEnum>::type>(rhs));
return lhs; return lhs;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type& requires EnableBitMaskOperators<TEnum>::enable
operator |=(TEnum& lhs, TEnum rhs) TEnum& operator |=(TEnum& lhs, TEnum rhs)
{ {
lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) | static_cast<typename std::underlying_type<TEnum>::type>(rhs)); lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) | static_cast<typename std::underlying_type<TEnum>::type>(rhs));
return lhs; return lhs;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableBitMaskOperators<TEnum>::enable, TEnum>::type& requires EnableBitMaskOperators<TEnum>::enable
operator ^=(TEnum& lhs, TEnum rhs) TEnum& operator ^=(TEnum& lhs, TEnum rhs)
{ {
lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) ^ static_cast<typename std::underlying_type<TEnum>::type>(rhs)); lhs = static_cast<TEnum> (static_cast<typename std::underlying_type<TEnum>::type>(lhs) ^ static_cast<typename std::underlying_type<TEnum>::type>(rhs));
return lhs; return lhs;
} }
template<typename TEnum, typename = std::enable_if_t<EnableBitMaskOperators<TEnum>::enable>> template<typename TEnum>
requires EnableBitMaskOperators<TEnum>::enable
constexpr bool operator==(TEnum lhs, std::underlying_type_t<TEnum> rhs) constexpr bool operator==(TEnum lhs, std::underlying_type_t<TEnum> rhs)
{ {
return static_cast<std::underlying_type_t<TEnum>>(lhs) == rhs; return static_cast<std::underlying_type_t<TEnum>>(lhs) == rhs;
} }
template<typename TEnum, typename = std::enable_if_t<EnableBitMaskOperators<TEnum>::enable>> template<typename TEnum>
requires EnableBitMaskOperators<TEnum>::enable
constexpr bool operator!=(TEnum lhs, std::underlying_type_t<TEnum> rhs) constexpr bool operator!=(TEnum lhs, std::underlying_type_t<TEnum> rhs)
{ {
return static_cast<std::underlying_type_t<TEnum>>(lhs) != rhs; return static_cast<std::underlying_type_t<TEnum>>(lhs) != rhs;
@ -82,43 +84,43 @@ struct EnableEnumIterators
}; };
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type& requires EnableEnumIterators<TEnum>::enable
operator++(TEnum& lhs) TEnum& operator++(TEnum& lhs)
{ {
lhs = static_cast<TEnum>(static_cast<typename std::underlying_type<TEnum>::type>(lhs) + 1); lhs = static_cast<TEnum>(static_cast<typename std::underlying_type<TEnum>::type>(lhs) + 1);
return lhs; return lhs;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type requires EnableEnumIterators<TEnum>::enable
operator*(TEnum rhs) TEnum operator*(TEnum rhs)
{ {
return rhs; return rhs;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type requires EnableEnumIterators<TEnum>::enable
begin(TEnum value) TEnum begin(TEnum value)
{ {
return EnableEnumIterators<TEnum>::begin; return EnableEnumIterators<TEnum>::begin;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type requires EnableEnumIterators<TEnum>::enable
rbegin(TEnum value) TEnum rbegin(TEnum value)
{ {
return EnableEnumIterators<TEnum>::rbegin; return EnableEnumIterators<TEnum>::rbegin;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type requires EnableEnumIterators<TEnum>::enable
end(TEnum r) { TEnum end(TEnum r) {
return EnableEnumIterators<TEnum>::end; return EnableEnumIterators<TEnum>::end;
} }
template<typename TEnum> template<typename TEnum>
typename std::enable_if<EnableEnumIterators<TEnum>::enable, TEnum>::type requires EnableEnumIterators<TEnum>::enable
rend(TEnum r) { TEnum rend(TEnum r) {
return EnableEnumIterators<TEnum>::rend; return EnableEnumIterators<TEnum>::rend;
} }

View file

@ -653,7 +653,8 @@ struct fmt::formatter<betype<T>> : fmt::formatter<T>
namespace stdx namespace stdx
{ {
// std::to_underlying // std::to_underlying
template <typename EnumT, typename = std::enable_if_t < std::is_enum<EnumT>{} >> template <typename EnumT>
requires (std::is_enum_v<EnumT>)
constexpr std::underlying_type_t<EnumT> to_underlying(EnumT e) noexcept { constexpr std::underlying_type_t<EnumT> to_underlying(EnumT e) noexcept {
return static_cast<std::underlying_type_t<EnumT>>(e); return static_cast<std::underlying_type_t<EnumT>>(e);
}; };
@ -689,7 +690,7 @@ namespace stdx
template<typename T> template<typename T>
class atomic_ref class atomic_ref
{ {
static_assert(std::is_trivially_copyable<T>::value, "atomic_ref requires trivially copyable types"); static_assert(std::is_trivially_copyable_v<T>, "atomic_ref requires trivially copyable types");
public: public:
using value_type = T; using value_type = T;

View file

@ -96,15 +96,15 @@ public:
m_value = v; m_value = v;
} }
template <typename = typename std::enable_if<std::is_same_v<TType, std::string>>>
void SetValue(std::string_view v) void SetValue(std::string_view v)
requires std::is_same_v<TType, std::string>
{ {
std::lock_guard lock(m_mutex); std::lock_guard lock(m_mutex);
m_value = v; m_value = v;
} }
template <typename = typename std::enable_if<std::is_same_v<TType, std::wstring>>>
void SetValue(std::wstring_view v) void SetValue(std::wstring_view v)
requires std::is_same_v<TType, std::string>
{ {
std::lock_guard lock(m_mutex); std::lock_guard lock(m_mutex);
m_value = v; m_value = v;
@ -171,22 +171,22 @@ public:
} }
// init from enum with iterators // init from enum with iterators
template<typename TEnum = typename std::enable_if<std::is_enum<TType>::value && EnableEnumIterators<TType>::enable, TType>>
constexpr ConfigValueBounds() constexpr ConfigValueBounds()
: base_type(), m_min_value(begin(TEnum{})), m_max_value(rbegin(TEnum{})) requires std::is_enum_v<TType> && EnableEnumIterators<TType>::enable
: base_type(), m_min_value(begin(TType{})), m_max_value(rbegin(TType{}))
{ {
assert(m_min_value <= this->GetInitValue() && this->GetInitValue() <= m_max_value); assert(m_min_value <= this->GetInitValue() && this->GetInitValue() <= m_max_value);
} }
template<typename TEnum = typename std::enable_if<std::is_enum<TType>::value && EnableEnumIterators<TType>::enable, TType>>
constexpr ConfigValueBounds(const TType& init_value) constexpr ConfigValueBounds(const TType& init_value)
requires std::is_enum_v<TType> && EnableEnumIterators<TType>::enable
: base_type(std::forward<TType>(init_value)), m_min_value(begin(init_value)), m_max_value(rbegin(init_value)) : base_type(std::forward<TType>(init_value)), m_min_value(begin(init_value)), m_max_value(rbegin(init_value))
{ {
assert(m_min_value <= init_value && init_value <= m_max_value); assert(m_min_value <= init_value && init_value <= m_max_value);
} }
template<typename TEnum = typename std::enable_if<std::is_enum<TType>::value && EnableEnumIterators<TType>::enable, TType>>
constexpr ConfigValueBounds(TType&& init_value) constexpr ConfigValueBounds(TType&& init_value)
requires std::is_enum_v<TType> && EnableEnumIterators<TType>::enable
: base_type(std::forward<TType>(init_value)), m_min_value(begin(init_value)), m_max_value(rbegin(init_value)) : base_type(std::forward<TType>(init_value)), m_min_value(begin(init_value)), m_max_value(rbegin(init_value))
{ {
assert(m_min_value <= init_value && init_value <= m_max_value); assert(m_min_value <= init_value && init_value <= m_max_value);

View file

@ -221,7 +221,7 @@ public:
{ {
auto* element = m_document->NewElement(name); auto* element = m_document->NewElement(name);
if constexpr (std::is_enum<T>::value) if constexpr (std::is_enum_v<T>)
element->SetText(fmt::format("{}", static_cast<typename std::underlying_type<T>::type>(value)).c_str()); element->SetText(fmt::format("{}", static_cast<typename std::underlying_type<T>::type>(value)).c_str());
else else
element->SetText(fmt::format("{}", value).c_str()); element->SetText(fmt::format("{}", value).c_str());

View file

@ -11,7 +11,7 @@ public:
template<typename T> template<typename T>
T* GetControl() const T* GetControl() const
{ {
static_assert(std::is_base_of<wxControl, T>::value, "T must inherit from wxControl"); static_assert(std::is_base_of_v<wxControl, T>, "T must inherit from wxControl");
return dynamic_cast<T*>(m_control); return dynamic_cast<T*>(m_control);
} }
@ -30,7 +30,7 @@ public:
template<typename T = wxControl> template<typename T = wxControl>
T* GetControl(int index) const T* GetControl(int index) const
{ {
static_assert(std::is_base_of<wxControl, T>::value, "T must inherit from wxControl"); static_assert(std::is_base_of_v<wxControl, T>, "T must inherit from wxControl");
if (index < 0 || index >= m_controls.size()) if (index < 0 || index >= m_controls.size())
return nullptr; return nullptr;

View file

@ -10,9 +10,8 @@ public:
bool Push(const T& v); bool Push(const T& v);
template<class Q = T> T Pop()
typename std::enable_if< !std::is_array<T>::value, Q >::type requires (!std::is_array_v<T>)
Pop()
{ {
std::unique_lock<std::mutex> lock(m_mutex); std::unique_lock<std::mutex> lock(m_mutex);
if (m_readPointer == m_writePointer) if (m_readPointer == m_writePointer)