fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary type_identity

Browse Source
This commit is contained in:
Victor Zverovich
2022-09-01 16:14:53 -07:00
parent 64e29893cf
commit b79ed4105a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/fmt/core.h
View File

@ -17,7 +17,7 @@
#include <type_traits> #include <type_traits>
// The fmt library version in the form major * 10000 + minor * 100 + patch. // The fmt library version in the form major * 10000 + minor * 100 + patch.
#define FMT_VERSION 90100 #define FMT_VERSION 90101
#if defined(__clang__) && !defined(__ibmxl__) #if defined(__clang__) && !defined(__ibmxl__)
# define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__) # define FMT_CLANG_VERSION (__clang_major__ * 100 + __clang_minor__)
@ -3012,11 +3012,11 @@ void check_format_string(S format_str) {
ignore_unused(invalid_format); ignore_unused(invalid_format);
} }
// Don't use type_identity for args to simplify symbols.
template <typename Char> template <typename Char>
void vformat_to( void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
buffer<Char>& buf, basic_string_view<Char> fmt, basic_format_args<FMT_BUFFER_CONTEXT(Char)> args,
basic_format_args<FMT_BUFFER_CONTEXT(type_identity_t<Char>)> args, locale_ref loc = {});
locale_ref loc = {});
FMT_API void vprint_mojibake(std::FILE*, string_view, format_args); FMT_API void vprint_mojibake(std::FILE*, string_view, format_args);
#ifndef _WIN32 #ifndef _WIN32
@ -3275,7 +3275,8 @@ template <typename... T>
FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt, FMT_NODISCARD FMT_INLINE auto formatted_size(format_string<T...> fmt,
T&&... args) -> size_t { T&&... args) -> size_t {
auto buf = detail::counting_buffer<>(); auto buf = detail::counting_buffer<>();
detail::vformat_to(buf, string_view(fmt), fmt::make_format_args(args...), {}); detail::vformat_to(buf, string_view(fmt),
format_args(fmt::make_format_args(args...)), {});
return buf.count(); return buf.count();
} }

7
include/fmt/format.h
View File

@ -4075,10 +4075,9 @@ FMT_NODISCARD auto to_string(const basic_memory_buffer<Char, SIZE>& buf)
FMT_BEGIN_DETAIL_NAMESPACE FMT_BEGIN_DETAIL_NAMESPACE
template <typename Char> template <typename Char>
void vformat_to( void vformat_to(buffer<Char>& buf, basic_string_view<Char> fmt,
buffer<Char>& buf, basic_string_view<Char> fmt, basic_format_args<FMT_BUFFER_CONTEXT(Char)> args,
basic_format_args<FMT_BUFFER_CONTEXT(type_identity_t<Char>)> args, locale_ref loc) {
locale_ref loc) {
// workaround for msvc bug regarding name-lookup in module // workaround for msvc bug regarding name-lookup in module
// link names into function scope // link names into function scope
using detail::arg_formatter; using detail::arg_formatter;