diff --git a/include/fmt/core.h b/include/fmt/core.h index 6fd2a3f6..0c2eaeea 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -439,11 +439,6 @@ template class basic_string_view { using string_view = basic_string_view; using wstring_view = basic_string_view; -#ifndef __cpp_char8_t -// char8_t is deprecated; use char instead. -using char8_t FMT_DEPRECATED_ALIAS = internal::char8_type; -#endif - /** Specifies if ``T`` is a character type. Can be specialized by users. */ template struct is_char : std::false_type {}; template <> struct is_char : std::true_type {}; @@ -613,12 +608,6 @@ class basic_format_parse_context : private ErrorHandler { using format_parse_context = basic_format_parse_context; using wformat_parse_context = basic_format_parse_context; -template -using basic_parse_context FMT_DEPRECATED_ALIAS = - basic_format_parse_context; -using parse_context FMT_DEPRECATED_ALIAS = basic_format_parse_context; -using wparse_context FMT_DEPRECATED_ALIAS = basic_format_parse_context; - template class basic_format_arg; template class basic_format_args; @@ -889,10 +878,9 @@ template struct named_arg_value { }; template struct custom_value { - using parse_context = basic_format_parse_context; + using parse_context = typename Context::parse_context_type; const void* value; - void (*format)(const void* arg, - typename Context::parse_context_type& parse_ctx, Context& ctx); + void (*format)(const void* arg, parse_context& parse_ctx, Context& ctx); }; // A formatting argument value. diff --git a/include/fmt/format.h b/include/fmt/format.h index 42da5be9..0d9dd0e6 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -43,10 +43,6 @@ #include "core.h" -#ifdef FMT_DEPRECATED_INCLUDE_OS -# include "os.h" -#endif - #ifdef __INTEL_COMPILER # define FMT_ICC_VERSION __INTEL_COMPILER #elif defined(__ICL) @@ -590,26 +586,6 @@ class buffer_range : public internal::output_range< : internal::output_range(std::back_inserter(buf)) {} }; -class FMT_DEPRECATED u8string_view - : public basic_string_view { - public: - u8string_view(const char* s) - : basic_string_view( - reinterpret_cast(s)) {} - u8string_view(const char* s, size_t count) FMT_NOEXCEPT - : basic_string_view( - reinterpret_cast(s), count) {} -}; - -#if FMT_USE_USER_DEFINED_LITERALS -inline namespace literals { -FMT_DEPRECATED inline basic_string_view operator"" _u( - const char* s, std::size_t n) { - return {reinterpret_cast(s), n}; -} -} // namespace literals -#endif - // The number of characters to store in the basic_memory_buffer object itself // to avoid dynamic memory allocation. enum { inline_buffer_size = 500 }; @@ -2702,10 +2678,6 @@ FMT_CONSTEXPR basic_string_view compile_string_to_view( */ #define FMT_STRING(s) FMT_STRING_IMPL(s, ) -#if defined(FMT_STRING_ALIAS) && FMT_STRING_ALIAS -# define fmt(s) FMT_STRING_IMPL(s, [[deprecated]]) -#endif - template ::value), int>> void check_format_string(S format_str) { @@ -2743,12 +2715,6 @@ FMT_API void report_error(format_func func, int error_code, string_view message) FMT_NOEXCEPT; } // namespace internal -template -using basic_writer FMT_DEPRECATED_ALIAS = internal::basic_writer; -using writer FMT_DEPRECATED_ALIAS = internal::writer; -using wwriter FMT_DEPRECATED_ALIAS = - internal::basic_writer>; - /** The default argument formatter. */ template class arg_formatter : public internal::arg_formatter_base { diff --git a/test/format-impl-test.cc b/test/format-impl-test.cc index e40ad907..d7f9abfe 100644 --- a/test/format-impl-test.cc +++ b/test/format-impl-test.cc @@ -426,9 +426,6 @@ TEST(FormatTest, FormatErrorCode) { } TEST(FormatTest, CountCodePoints) { -#ifndef __cpp_char8_t - using fmt::char8_t; -#endif EXPECT_EQ( 4, fmt::internal::count_code_points( fmt::basic_string_view(