diff --git a/doc/api.rst b/doc/api.rst index 9ac28724..3eb82325 100644 --- a/doc/api.rst +++ b/doc/api.rst @@ -313,7 +313,7 @@ The following user-defined literals are defined in ``fmt/format.h``. .. doxygenfunction:: operator""_format(const char *s, size_t n) -> detail::udl_formatter -.. doxygenfunction:: operator""_a() +.. doxygenfunction:: operator""_aconst char *s, size_t) Utilities --------- diff --git a/doc/build.py b/doc/build.py index 741f6013..f6cb5f53 100755 --- a/doc/build.py +++ b/doc/build.py @@ -68,7 +68,7 @@ def build_docs(version='dev', **kwargs): FMT_USE_RVALUE_REFERENCES=1 \ FMT_USE_USER_DEFINED_LITERALS=1 \ FMT_USE_ALIAS_TEMPLATES=1 \ - FMT_USE_NONTYPE_TEMPLATE_PARAMETERS=1 \ + FMT_USE_NONTYPE_TEMPLATE_ARGS=1 \ FMT_API= \ "FMT_BEGIN_NAMESPACE=namespace fmt {{" \ "FMT_END_NAMESPACE=}}" \ diff --git a/include/fmt/xchar.h b/include/fmt/xchar.h index ea34917f..ac0f1832 100644 --- a/include/fmt/xchar.h +++ b/include/fmt/xchar.h @@ -47,11 +47,6 @@ constexpr format_arg_store make_wformat_args( } inline namespace literals { -constexpr auto operator"" _format(const wchar_t* s, size_t n) - -> detail::udl_formatter { - return {{s, n}}; -} - #if FMT_USE_USER_DEFINED_LITERALS && !FMT_USE_NONTYPE_TEMPLATE_ARGS constexpr detail::udl_arg operator"" _a(const wchar_t* s, size_t) { return {s}; diff --git a/test/xchar-test.cc b/test/xchar-test.cc index 498ff651..4183b4b8 100644 --- a/test/xchar-test.cc +++ b/test/xchar-test.cc @@ -185,11 +185,6 @@ TEST(format_test, wide_format_to_n) { } #if FMT_USE_USER_DEFINED_LITERALS -TEST(xchar_test, format_udl) { - using namespace fmt::literals; - EXPECT_EQ(L"{}c{}"_format(L"ab", 1), fmt::format(L"{}c{}", L"ab", 1)); -} - TEST(xchar_test, named_arg_udl) { using namespace fmt::literals; auto udl_a =