summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Mai M2022-05-14 18:51:23 -0400
committerGravatar GitHub2022-05-14 18:51:23 -0400
commit5c20373db3204687cfa3f287702d277b97bd80ed (patch)
treebe27c0a623bfe7e0963863b7a49b5d76a060cbd7 /src
parentMerge pull request #8308 from german77/disablesix (diff)
parentgeneral: Avoid ambiguous format_to compilation errors (diff)
downloadyuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.gz
yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.tar.xz
yuzu-5c20373db3204687cfa3f287702d277b97bd80ed.zip
Merge pull request #8337 from lioncash/fmt
general: Avoid ambiguous format_to compilation errors
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_cp15.cpp2
-rw-r--r--src/shader_recompiler/frontend/ir/opcodes.h2
-rw-r--r--src/shader_recompiler/frontend/maxwell/opcodes.h2
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> {
20 } 20 }
21 template <typename FormatContext> 21 template <typename FormatContext>
22 auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) { 22 auto format(const Dynarmic::A32::CoprocReg& reg, FormatContext& ctx) {
23 return format_to(ctx.out(), "cp{}", static_cast<size_t>(reg)); 23 return fmt::format_to(ctx.out(), "cp{}", static_cast<size_t>(reg));
24 } 24 }
25}; 25};
26 26
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> {
103 } 103 }
104 template <typename FormatContext> 104 template <typename FormatContext>
105 auto format(const Shader::IR::Opcode& op, FormatContext& ctx) { 105 auto format(const Shader::IR::Opcode& op, FormatContext& ctx) {
106 return format_to(ctx.out(), "{}", Shader::IR::NameOf(op)); 106 return fmt::format_to(ctx.out(), "{}", Shader::IR::NameOf(op));
107 } 107 }
108}; 108};
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> {
24 } 24 }
25 template <typename FormatContext> 25 template <typename FormatContext>
26 auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) { 26 auto format(const Shader::Maxwell::Opcode& opcode, FormatContext& ctx) {
27 return format_to(ctx.out(), "{}", NameOf(opcode)); 27 return fmt::format_to(ctx.out(), "{}", NameOf(opcode));
28 } 28 }
29}; 29};