diff options
| author | Mai M <mathew1800@gmail.com> | 2022-05-14 18:51:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-14 18:51:23 -0400 |
| commit | 5c20373db3204687cfa3f287702d277b97bd80ed (patch) | |
| tree | be27c0a623bfe7e0963863b7a49b5d76a060cbd7 | |
| parent | 0b9ef3c0b844fbda14390c94bb6ddd37e3b36c90 (diff) | |
| parent | f981e90af3a911596442aaf0f1e049f1b8e6003f (diff) | |
Merge pull request #8337 from lioncash/fmt
general: Avoid ambiguous format_to compilation errors
| -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 a043e6735d..6aae79c480 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 d17dc0376b..752879a186 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 83093fca08..72dd143c2a 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)); } }; |