mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-05 15:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

StringUtil: Use requires-clause instead of enable_if.

Browse source
This commit is contained in:
Jordan Woyak 2025-04-03 17:46:31 -05:00
commit c5ace605dd
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/Common/StringUtil.h
View file

@ -123,8 +123,8 @@ requires(detail::IsBooleanEnum<T>()) bool TryParse(const std::string& str, T* ou
return true; return true;
} }
template <typename T, std::enable_if_t<std::is_floating_point_v<T>>* = nullptr> template <typename T>
bool TryParse(std::string str, T* const output) requires(std::is_floating_point_v<T>) bool TryParse(std::string str, T* const output)
{ {
// Replace commas with dots. // Replace commas with dots.
std::istringstream iss(ReplaceAll(std::move(str), ",", ".")); std::istringstream iss(ReplaceAll(std::move(str), ",", "."));
@ -169,8 +169,8 @@ std::string ValueToString(double value);
std::string ValueToString(int value); std::string ValueToString(int value);
std::string ValueToString(s64 value); std::string ValueToString(s64 value);
std::string ValueToString(bool value); std::string ValueToString(bool value);
template <typename T, std::enable_if_t<std::is_enum<T>::value>* = nullptr> template <typename T>
std::string ValueToString(T value) requires(std::is_enum_v<T>) std::string ValueToString(T value)
{ {
return ValueToString(static_cast<std::underlying_type_t<T>>(value)); return ValueToString(static_cast<std::underlying_type_t<T>>(value));
} }
@ -180,16 +180,17 @@ std::string HexDump(const u8* data, size_t size);
namespace Common namespace Common
{ {
template <typename T, typename std::enable_if_t<std::is_integral_v<T>>* = nullptr> template <typename T>
std::from_chars_result FromChars(std::string_view sv, T& value, int base = 10) requires(std::is_integral_v<T>) std::from_chars_result
FromChars(std::string_view sv, T& value, int base = 10)
{ {
const char* const first = sv.data(); const char* const first = sv.data();
const char* const last = first + sv.size(); const char* const last = first + sv.size();
return std::from_chars(first, last, value, base); return std::from_chars(first, last, value, base);
} }
template <typename T, typename std::enable_if_t<std::is_floating_point_v<T>>* = nullptr> template <typename T>
std::from_chars_result FromChars(std::string_view sv, T& value, requires(std::is_floating_point_v<T>) std::from_chars_result
std::chars_format fmt = std::chars_format::general) FromChars(std::string_view sv, T& value, std::chars_format fmt = std::chars_format::general)
{ {
const char* const first = sv.data(); const char* const first = sv.data();
const char* const last = first + sv.size(); const char* const last = first + sv.size();