diff --git a/include/fmt/core.h b/include/fmt/core.h index c028b1df..48de108a 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -969,6 +969,11 @@ template struct arg_mapper { return val; } + FMT_CONSTEXPR const named_arg_base& map( + const named_arg_base& val){ + return val; + } + int map(...) { constexpr bool formattable = sizeof(Context) == 0; static_assert( @@ -1005,10 +1010,6 @@ template class basic_format_arg { friend FMT_CONSTEXPR basic_format_arg internal::make_arg( const T& value); - template - friend FMT_CONSTEXPR basic_format_arg internal::make_arg( - const internal::named_arg_base& value); - template friend FMT_CONSTEXPR auto visit_format_arg(Visitor&& vis, const basic_format_arg& arg) @@ -1181,15 +1182,6 @@ template make_arg(const T& value) { return make_arg(value); } - -template -FMT_CONSTEXPR basic_format_arg make_arg( - const named_arg_base& value) { - basic_format_arg arg; - arg.type_ = type::named_arg_type; - arg.value_ = value; - return arg; -} } // namespace internal // Formatting context. diff --git a/include/fmt/dyn-args.h b/include/fmt/dyn-args.h index e80f810a..6b3c5ee1 100644 --- a/include/fmt/dyn-args.h +++ b/include/fmt/dyn-args.h @@ -191,6 +191,8 @@ class dynamic_format_arg_store internal::arg_mapper().map(named_with_stored_parts); named_args_.push_front(named_with_stored_parts); data_.emplace_back(internal::make_arg(named_args_.front())); +// data_.emplace_back(internal::make_arg_from_serialized_named( +// named_args_.front())); } };