diff --git a/include/fmt/core.h b/include/fmt/core.h index c16f5179..3dd4a674 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -8,10 +8,11 @@ #ifndef FMT_CORE_H_ #define FMT_CORE_H_ +#include // CHAR_BIT +#include // FILE +#include // strlen + #include // std::byte -#include // std::FILE -#include // std::strlen -#include // CHAR_BIT #include // std::string #include // std::enable_if @@ -487,7 +488,7 @@ template class basic_string_view { : data_(s), size_(detail::const_check(std::is_same::value && !detail::is_constant_evaluated(false)) - ? std::strlen(reinterpret_cast(s)) + ? strlen(reinterpret_cast(s)) : detail::length(s)) {} /** @@ -1721,7 +1722,7 @@ template class basic_format_arg { template FMT_DEPRECATED FMT_CONSTEXPR FMT_INLINE auto visit_format_arg( Visitor&& vis, const basic_format_arg& arg) -> decltype(vis(0)) { - return arg.visit(std::forward(vis)); + return arg.visit(static_cast(vis)); } // Formatting context. @@ -2146,8 +2147,8 @@ FMT_CONSTEXPR auto find(Ptr first, Ptr last, T value, Ptr& out) -> bool { template <> inline auto find(const char* first, const char* last, char value, const char*& out) -> bool { - out = static_cast( - std::memchr(first, value, to_unsigned(last - first))); + out = + static_cast(memchr(first, value, to_unsigned(last - first))); return out != nullptr; } @@ -2705,9 +2706,9 @@ template void vformat_to(buffer& buf, basic_string_view fmt, typename vformat_args::type args, locale_ref loc = {}); -FMT_API void vprint_mojibake(std::FILE*, string_view, format_args); +FMT_API void vprint_mojibake(FILE*, string_view, format_args); #ifndef _WIN32 -inline void vprint_mojibake(std::FILE*, string_view, format_args) {} +inline void vprint_mojibake(FILE*, string_view, format_args) {} #endif } // namespace detail @@ -2889,7 +2890,7 @@ FMT_NODISCARD FMT_INLINE auto formatted_size(format_string fmt, } FMT_API void vprint(string_view fmt, format_args args); -FMT_API void vprint(std::FILE* f, string_view fmt, format_args args); +FMT_API void vprint(FILE* f, string_view fmt, format_args args); /** \rst @@ -2919,7 +2920,7 @@ FMT_INLINE void print(format_string fmt, T&&... args) { \endrst */ template -FMT_INLINE void print(std::FILE* f, format_string fmt, T&&... args) { +FMT_INLINE void print(FILE* f, format_string fmt, T&&... args) { const auto& vargs = fmt::make_format_args(args...); return detail::is_utf8() ? vprint(f, fmt, vargs) : detail::vprint_mojibake(f, fmt, vargs); @@ -2930,8 +2931,8 @@ FMT_INLINE void print(std::FILE* f, format_string fmt, T&&... args) { output to the file ``f`` followed by a newline. */ template -FMT_INLINE void println(std::FILE* f, format_string fmt, T&&... args) { - return fmt::print(f, "{}\n", fmt::format(fmt, std::forward(args)...)); +FMT_INLINE void println(FILE* f, format_string fmt, T&&... args) { + return fmt::print(f, "{}\n", fmt::format(fmt, static_cast(args)...)); } /** @@ -2940,7 +2941,7 @@ FMT_INLINE void println(std::FILE* f, format_string fmt, T&&... args) { */ template FMT_INLINE void println(format_string fmt, T&&... args) { - return fmt::println(stdout, fmt, std::forward(args)...); + return fmt::println(stdout, fmt, static_cast(args)...); } FMT_END_EXPORT