@@ -140,7 +140,7 @@ template <typename Variant, typename Char> class is_variant_formattable {
140140
141141#if FMT_USE_RTTI
142142
143- template <typename Char, typename OutputIt>
143+ template <typename OutputIt>
144144auto write_demangled_name (OutputIt out, const std::type_info& ti) -> OutputIt {
145145# ifdef FMT_HAS_ABI_CXA_DEMANGLE
146146 int status = 0 ;
@@ -180,7 +180,7 @@ auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
180180 } else {
181181 demangled_name_view = string_view (ti.name ());
182182 }
183- return detail::write_bytes<Char >(out, demangled_name_view);
183+ return detail::write_bytes<char >(out, demangled_name_view);
184184# elif FMT_MSC_VERSION
185185 const string_view demangled_name (ti.name ());
186186 for (size_t i = 0 ; i < demangled_name.size (); ++i) {
@@ -202,7 +202,7 @@ auto write_demangled_name(OutputIt out, const std::type_info& ti) -> OutputIt {
202202 }
203203 return out;
204204# else
205- return detail::write_bytes<Char >(out, string_view (ti.name ()));
205+ return detail::write_bytes<char >(out, string_view (ti.name ()));
206206# endif
207207}
208208
@@ -541,31 +541,29 @@ template <> struct formatter<std::error_code> {
541541};
542542
543543#if FMT_USE_RTTI
544- template <typename Char>
545- struct formatter <std::type_info, Char // DEPRECATED! Mixing code unit types.
546- > {
544+ struct formatter <std::type_info> {
547545 public:
548- FMT_CONSTEXPR auto parse (parse_context<Char >& ctx) -> const Char * {
546+ FMT_CONSTEXPR auto parse (parse_context<>& ctx) -> const char * {
549547 return ctx.begin ();
550548 }
551549
552550 template <typename Context>
553551 auto format (const std::type_info& ti, Context& ctx) const
554552 -> decltype(ctx.out()) {
555- return detail::write_demangled_name<Char >(ctx.out (), ti);
553+ return detail::write_demangled_name<char >(ctx.out (), ti);
556554 }
557555};
558556#endif // FMT_USE_RTTI
559557
560- template <typename T, typename Char >
558+ template <typename T>
561559struct formatter <
562- T, Char, // DEPRECATED! Mixing code unit types.
560+ T, char ,
563561 typename std::enable_if<std::is_base_of<std::exception, T>::value>::type> {
564562 private:
565563 bool with_typename_ = false ;
566564
567565 public:
568- FMT_CONSTEXPR auto parse (parse_context<Char >& ctx) -> const Char * {
566+ FMT_CONSTEXPR auto parse (parse_context<>& ctx) -> const char * {
569567 auto it = ctx.begin ();
570568 auto end = ctx.end ();
571569 if (it == end || *it == ' }' ) return it;
@@ -582,7 +580,7 @@ struct formatter<
582580 auto out = ctx.out ();
583581#if FMT_USE_RTTI
584582 if (with_typename_) {
585- out = detail::write_demangled_name<Char >(out, typeid (ex));
583+ out = detail::write_demangled_name<char >(out, typeid (ex));
586584 *out++ = ' :' ;
587585 *out++ = ' ' ;
588586 }
0 commit comments