Browse Source
Merge pull request #8337 from lioncash/fmt
general: Avoid ambiguous format_to compilation errors
pull/15/merge
Mai M
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
-
src/shader_recompiler/frontend/ir/opcodes.h
-
src/shader_recompiler/frontend/maxwell/opcodes.h
|
|
|
@ -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)); |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
@ -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)); |
|
|
|
} |
|
|
|
}; |
|
|
|
@ -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)); |
|
|
|
} |
|
|
|
}; |