aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2022-05-14 18:51:23 -0400
committerGitHub <noreply@github.com>2022-05-14 18:51:23 -0400
commit773dcb3a4bc823af415d3c90a401dfef39cda63d (patch)
treebe27c0a623bfe7e0963863b7a49b5d76a060cbd7 /src
parent6f622de3a817480d131b82756932cb4bd364599e (diff)
parent9272114d865a91b568d9dca9b4c9820f70146c8b (diff)
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 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));
}
};