The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 09:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for fmt 11 (#1366)

Browse Source
This commit is contained in:
Alexandre Bouvier 2024-10-03 06:48:25 +00:00 committed by GitHub
parent 8508c62540
commit 6dc73f5d79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cemu/Logging/CemuLogging.h
View File

@ -91,7 +91,11 @@ bool cemuLog_log(LogType type, std::basic_string<T> formatStr, TArgs&&... args)
else else
{ {
const auto format_view = fmt::basic_string_view<T>(formatStr); const auto format_view = fmt::basic_string_view<T>(formatStr);
#if FMT_VERSION >= 110000
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffered_context<T>>(args...));
#else
const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffer_context<T>>(args...)); const auto text = fmt::vformat(format_view, fmt::make_format_args<fmt::buffer_context<T>>(args...));
#endif
cemuLog_log(type, std::basic_string_view(text.data(), text.size())); cemuLog_log(type, std::basic_string_view(text.data(), text.size()));
} }
return true; return true;

10
src/config/CemuConfig.h
View File

@ -194,7 +194,7 @@ ENABLE_ENUM_ITERATORS(CrashDump, CrashDump::Disabled, CrashDump::Enabled);
template <> template <>
struct fmt::formatter<PrecompiledShaderOption> : formatter<string_view> { struct fmt::formatter<PrecompiledShaderOption> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(const PrecompiledShaderOption c, FormatContext &ctx) { auto format(const PrecompiledShaderOption c, FormatContext &ctx) const {
string_view name; string_view name;
switch (c) switch (c)
{ {
@ -209,7 +209,7 @@ struct fmt::formatter<PrecompiledShaderOption> : formatter<string_view> {
template <> template <>
struct fmt::formatter<AccurateShaderMulOption> : formatter<string_view> { struct fmt::formatter<AccurateShaderMulOption> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(const AccurateShaderMulOption c, FormatContext &ctx) { auto format(const AccurateShaderMulOption c, FormatContext &ctx) const {
string_view name; string_view name;
switch (c) switch (c)
{ {
@ -223,7 +223,7 @@ struct fmt::formatter<AccurateShaderMulOption> : formatter<string_view> {
template <> template <>
struct fmt::formatter<CPUMode> : formatter<string_view> { struct fmt::formatter<CPUMode> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(const CPUMode c, FormatContext &ctx) { auto format(const CPUMode c, FormatContext &ctx) const {
string_view name; string_view name;
switch (c) switch (c)
{ {
@ -240,7 +240,7 @@ struct fmt::formatter<CPUMode> : formatter<string_view> {
template <> template <>
struct fmt::formatter<CPUModeLegacy> : formatter<string_view> { struct fmt::formatter<CPUModeLegacy> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(const CPUModeLegacy c, FormatContext &ctx) { auto format(const CPUModeLegacy c, FormatContext &ctx) const {
string_view name; string_view name;
switch (c) switch (c)
{ {
@ -257,7 +257,7 @@ struct fmt::formatter<CPUModeLegacy> : formatter<string_view> {
template <> template <>
struct fmt::formatter<CafeConsoleRegion> : formatter<string_view> { struct fmt::formatter<CafeConsoleRegion> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(const CafeConsoleRegion v, FormatContext &ctx) { auto format(const CafeConsoleRegion v, FormatContext &ctx) const {
string_view name; string_view name;
switch (v) switch (v)
{ {

2
src/gui/helpers/wxHelpers.h
View File

@ -8,7 +8,7 @@ template <>
struct fmt::formatter<wxString> : formatter<string_view> struct fmt::formatter<wxString> : formatter<string_view>
{ {
template <typename FormatContext> template <typename FormatContext>
auto format(const wxString& str, FormatContext& ctx) auto format(const wxString& str, FormatContext& ctx) const
{ {
return formatter<string_view>::format(str.c_str().AsChar(), ctx); return formatter<string_view>::format(str.c_str().AsChar(), ctx);
} }

2
src/input/emulated/EmulatedController.h
View File

@ -127,7 +127,7 @@ using EmulatedControllerPtr = std::shared_ptr<EmulatedController>;
template <> template <>
struct fmt::formatter<EmulatedController::Type> : formatter<string_view> { struct fmt::formatter<EmulatedController::Type> : formatter<string_view> {
template <typename FormatContext> template <typename FormatContext>
auto format(EmulatedController::Type v, FormatContext& ctx) { auto format(EmulatedController::Type v, FormatContext& ctx) const {
switch (v) switch (v)
{ {
case EmulatedController::Type::VPAD: return formatter<string_view>::format("Wii U Gamepad", ctx); case EmulatedController::Type::VPAD: return formatter<string_view>::format("Wii U Gamepad", ctx);