diff --git a/include/fmt/core.h b/include/fmt/core.h index 2e8d9675..2e5a51fe 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -364,7 +364,6 @@ template class basic_string_view { size_t size_; public: - using char_type FMT_DEPRECATED_ALIAS = Char; using value_type = Char; using iterator = const Char*; @@ -638,11 +637,6 @@ struct formatter { formatter() = delete; }; -template -struct FMT_DEPRECATED convert_to_int - : bool_constant::value && - std::is_convertible::value> {}; - // Specifies if T has an enabled formatter specialization. A type can be // formattable even if it doesn't have a formatter e.g. via a conversion. template @@ -1401,8 +1395,6 @@ class format_arg_store : 0); public: - FMT_DEPRECATED static constexpr unsigned long long types = desc; - format_arg_store(const Args&... args) : #if FMT_GCC_VERSION && FMT_GCC_VERSION < 409 diff --git a/include/fmt/format.h b/include/fmt/format.h index 2c761094..a087ca31 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -226,11 +226,6 @@ FMT_END_NAMESPACE # define FMT_NUMERIC_ALIGN 1 #endif -// Enable the deprecated percent specifier. -#ifndef FMT_DEPRECATED_PERCENT -# define FMT_DEPRECATED_PERCENT 0 -#endif - FMT_BEGIN_NAMESPACE namespace internal { @@ -1086,7 +1081,6 @@ struct float_specs { sign_t sign : 8; bool upper : 1; bool locale : 1; - bool percent : 1; bool binary32 : 1; bool use_grisu : 1; bool showpoint : 1; @@ -1288,12 +1282,6 @@ FMT_CONSTEXPR float_specs parse_float_type_spec( result.format = float_format::fixed; result.showpoint |= specs.precision != 0; break; -#if FMT_DEPRECATED_PERCENT - case '%': - result.format = float_format::fixed; - result.percent = true; - break; -#endif case 'A': result.upper = true; FMT_FALLTHROUGH; @@ -1700,12 +1688,7 @@ template class basic_writer { } if (const_check(std::is_same())) fspecs.binary32 = true; fspecs.use_grisu = use_grisu(); - if (const_check(FMT_DEPRECATED_PERCENT) && fspecs.percent) value *= 100; int exp = format_float(promote_float(value), precision, fspecs, buffer); - if (const_check(FMT_DEPRECATED_PERCENT) && fspecs.percent) { - buffer.push_back('%'); - --exp; // Adjust decimal place position. - } fspecs.precision = precision; char_type point = fspecs.locale ? decimal_point(locale_) : static_cast('.'); @@ -1821,7 +1804,6 @@ class arg_formatter_base { protected: writer_type& writer() { return writer_; } - FMT_DEPRECATED format_specs* spec() { return specs_; } format_specs* specs() { return specs_; } iterator out() { return writer_.out(); }