mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-11-07 08:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a macro to workaround clang/gcc ABI incompatibility on ARM

Browse Source
This commit is contained in:
Victor Zverovich 2020-10-31 07:51:39 -07:00
parent 112755cf91
commit e50ced88c6
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/fmt/core.h
View File

@ -1938,7 +1938,14 @@ template <typename Context> class basic_format_args {
} }
}; };
/** An alias to ``basic_format_args<context>``. */ #ifdef FMT_ARM_ABI_COMPATIBILITY
/** An alias to ``basic_format_args<format_context>``. */
// Separate types would result in shorter symbols but break ABI compatibility
// between clang and gcc on ARM (#1919).
using format_args = basic_format_args<format_context>;
using wformat_args = basic_format_args<wformat_context>;
#else
// DEPRECATED! These are kept for ABI compatibility.
// It is a separate type rather than an alias to make symbols readable. // It is a separate type rather than an alias to make symbols readable.
struct format_args : basic_format_args<format_context> { struct format_args : basic_format_args<format_context> {
template <typename... Args> template <typename... Args>
@ -1947,6 +1954,7 @@ struct format_args : basic_format_args<format_context> {
struct wformat_args : basic_format_args<wformat_context> { struct wformat_args : basic_format_args<wformat_context> {
using basic_format_args::basic_format_args; using basic_format_args::basic_format_args;
}; };
#endif
namespace detail { namespace detail {
@ -1978,10 +1986,9 @@ inline void vprint_mojibake(std::FILE*, string_view, format_args) {}
// vformat_to<ArgFormatter>(...) overload, so SFINAE on iterator type instead. // vformat_to<ArgFormatter>(...) overload, so SFINAE on iterator type instead.
template <typename OutputIt, typename S, typename Char = char_t<S>, template <typename OutputIt, typename S, typename Char = char_t<S>,
bool enable = detail::is_output_iterator<OutputIt, Char>::value> bool enable = detail::is_output_iterator<OutputIt, Char>::value>
auto vformat_to( auto vformat_to(OutputIt out, const S& format_str,
OutputIt out, const S& format_str, basic_format_args<buffer_context<type_identity_t<Char>>> args)
basic_format_args<buffer_context<type_identity_t<Char>>> args) -> -> typename std::enable_if<enable, OutputIt>::type {
typename std::enable_if<enable, OutputIt>::type {
decltype(detail::get_buffer<Char>(out)) buf(detail::get_buffer_init(out)); decltype(detail::get_buffer<Char>(out)) buf(detail::get_buffer_init(out));
detail::vformat_to(buf, to_string_view(format_str), args); detail::vformat_to(buf, to_string_view(format_str), args);
return detail::get_iterator(buf); return detail::get_iterator(buf);
@ -2034,8 +2041,8 @@ inline format_to_n_result<OutputIt> vformat_to_n(
*/ */
template <typename OutputIt, typename S, typename... Args, template <typename OutputIt, typename S, typename... Args,
bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value> bool enable = detail::is_output_iterator<OutputIt, char_t<S>>::value>
inline auto format_to_n(OutputIt out, size_t n, inline auto format_to_n(OutputIt out, size_t n, const S& format_str,
const S& format_str, const Args&... args) -> const Args&... args) ->
typename std::enable_if<enable, format_to_n_result<OutputIt>>::type { typename std::enable_if<enable, format_to_n_result<OutputIt>>::type {
const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...); const auto& vargs = fmt::make_args_checked<Args...>(format_str, args...);
return vformat_to_n(out, n, to_string_view(format_str), vargs); return vformat_to_n(out, n, to_string_view(format_str), vargs);