diff options
| author | Mai M <mathew1800@gmail.com> | 2022-05-15 00:51:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 00:51:23 +0200 |
| commit | 5c20373db3204687cfa3f287702d277b97bd80ed (patch) | |
| tree | be27c0a623bfe7e0963863b7a49b5d76a060cbd7 | |
| parent | Merge pull request #8308 from german77/disablesix (diff) | |
| parent | general: Avoid ambiguous format_to compilation errors (diff) | |
| download | yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.gz yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.bz2 yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.lz yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.xz yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.zst yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.zip | |
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_cp15.cpp | 2 | ||||
| -rw-r--r-- | src/shader_recompiler/frontend/ir/opcodes.h | 2 | ||||
| -rw-r--r-- | src/shader_recompiler/frontend/maxwell/opcodes.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp index a043e6735..6aae79c48 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp @@ -20,7 +20,7 @@ struct fmt::formatter<Dynarmic::A32::CoprocReg> { } template <typename FormatContext> auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) { - return format_to(ctx.out(), "cp{}", static_cast<size_t>(reg)); + return fmt::format_to(ctx.out(), "cp{}", static_cast<size_t>(reg)); } }; diff --git a/src/shader_recompiler/frontend/ir/opcodes.h b/src/shader_recompiler/frontend/ir/opcodes.h index d17dc0376..752879a18 100644 --- a/src/shader_recompiler/frontend/ir/opcodes.h +++ b/src/shader_recompiler/frontend/ir/opcodes.h @@ -103,6 +103,6 @@ struct fmt::formatter<Shader::IR::Opcode> { } template <typename FormatContext> auto format(const Shader::IR::Opcode& op, FormatContext& ctx) { - return format_to(ctx.out(), "{}", Shader::IR::NameOf(op)); + return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(op)); } }; diff --git a/src/shader_recompiler/frontend/maxwell/opcodes.h b/src/shader_recompiler/frontend/maxwell/opcodes.h index 83093fca0..72dd143c2 100644 --- a/src/shader_recompiler/frontend/maxwell/opcodes.h +++ b/src/shader_recompiler/frontend/maxwell/opcodes.h @@ -24,6 +24,6 @@ struct fmt::formatter<Shader::Maxwell::Opcode> { } template <typename FormatContext> auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) { - return format_to(ctx.out(), "{}", NameOf(opcode)); + return fmt::format_to(ctx.out(), "{}", NameOf(opcode)); } }; |