Fixed issue with formatting to an array of chars

This commit is contained in:
stryku
2019-05-21 21:03:57 +02:00
committed by Victor Zverovich
parent 87fbc6f756
commit 9427f15bef
2 changed files with 67 additions and 8 deletions

View File

@@ -217,7 +217,8 @@ class prepared_format {
std::basic_string<char_type> format(const Args&... args) const {
basic_memory_buffer<char_type> buffer;
typedef back_insert_range<internal::buffer<char_type>> range;
this->vformat_to(range(buffer), make_args_checked(format_, args...));
this->vformat_to(range(buffer), basic_format_args<context>{
make_args_checked(format_, args...)});
return to_string(buffer);
}
@@ -226,7 +227,8 @@ class prepared_format {
std::back_insert_iterator<Container> out, const Args&... args) const {
internal::container_buffer<Container> buffer(internal::get_container(out));
typedef back_insert_range<internal::buffer<char_type>> range;
this->vformat_to(range(buffer), make_args_checked(format_, args...));
this->vformat_to(range(buffer), basic_format_args<context>{
make_args_checked(format_, args...)});
return out;
}
@@ -242,18 +244,20 @@ class prepared_format {
inline typename buffer_context<char_type>::iterator format_to(
basic_memory_buffer<char_type, SIZE>& buf, const Args&... args) const {
typedef back_insert_range<internal::buffer<char_type>> range;
return this->vformat_to(range(buf), make_args_checked(format_, args...));
return this->vformat_to(
range(buf),
basic_format_args<context>{make_args_checked(format_, args...)});
}
private:
typedef buffer_context<char_type> context;
template <typename Range>
typename context::iterator vformat_to(Range out,
basic_format_args<context> args) const {
template <typename Range, typename Context>
auto vformat_to(Range out, basic_format_args<Context> args) const ->
typename Context::iterator {
const auto format_view = internal::to_string_view(format_);
basic_parse_context<char_type> parse_ctx(format_view);
context ctx(out.begin(), args);
Context ctx(out.begin(), args);
const auto& parts = parts_provider_.parts();
for (auto part_it = parts.begin(); part_it != parts.end(); ++part_it) {