ArgFormatter -> arg_formatter

This commit is contained in:
Victor Zverovich
2017-02-18 07:46:32 -08:00
parent 50e716737d
commit 4ec8860783
5 changed files with 23 additions and 23 deletions
+8 -8
View File
@@ -381,10 +381,10 @@ template <typename Context>
class basic_arg;
template <typename Char>
class ArgFormatter;
class arg_formatter;
template <typename Char>
class PrintfArgFormatter;
class printf_arg_formatter;
template <typename Char>
class basic_context;
@@ -2016,7 +2016,7 @@ class context_base {
/** The default argument formatter. */
template <typename Char>
class ArgFormatter : public internal::ArgFormatterBase<Char> {
class arg_formatter : public internal::ArgFormatterBase<Char> {
private:
basic_context<Char> &ctx_;
@@ -2033,8 +2033,8 @@ class ArgFormatter : public internal::ArgFormatterBase<Char> {
format specifier information for standard argument types.
\endrst
*/
ArgFormatter(basic_buffer<Char> &buffer, basic_context<Char> &ctx,
format_specs &spec)
arg_formatter(basic_buffer<Char> &buffer, basic_context<Char> &ctx,
format_specs &spec)
: internal::ArgFormatterBase<Char>(buffer, spec), ctx_(ctx) {}
using internal::ArgFormatterBase<Char>::operator();
@@ -2277,7 +2277,7 @@ class basic_writer {
friend class internal::ArgFormatterBase;
template <typename Char_>
friend class PrintfArgFormatter;
friend class printf_arg_formatter;
public:
/**
@@ -2939,11 +2939,11 @@ void vformat_to(basic_buffer<Char> &buffer, BasicCStringRef<Char> format_str,
basic_args<Context> args);
inline void vformat_to(buffer &buf, CStringRef format_str, args args) {
vformat_to<ArgFormatter<char>>(buf, format_str, args);
vformat_to<arg_formatter<char>>(buf, format_str, args);
}
inline void vformat_to(wbuffer &buf, WCStringRef format_str, wargs args) {
vformat_to<ArgFormatter<wchar_t>>(buf, format_str, args);
vformat_to<arg_formatter<wchar_t>>(buf, format_str, args);
}
template <typename... Args>
+1 -1
View File
@@ -86,7 +86,7 @@ void format_value(basic_buffer<Char> &buf, const T &value,
internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
internal::format_value(buffer, value);
basic_string_view<Char> str(buffer.data(), buffer.size());
do_format_arg< ArgFormatter<Char> >(
do_format_arg< arg_formatter<Char> >(
buf, internal::make_arg< basic_context<Char> >(str), ctx);
}
+3 -3
View File
@@ -210,7 +210,7 @@ class PrintfWidthHandler {
\endrst
*/
template <typename Char>
class PrintfArgFormatter : public internal::ArgFormatterBase<Char> {
class printf_arg_formatter : public internal::ArgFormatterBase<Char> {
private:
void write_null_pointer() {
this->spec().type_ = 0;
@@ -229,7 +229,7 @@ class PrintfArgFormatter : public internal::ArgFormatterBase<Char> {
specifier information for standard argument types.
\endrst
*/
PrintfArgFormatter(basic_buffer<Char> &buffer, format_specs &spec)
printf_arg_formatter(basic_buffer<Char> &buffer, format_specs &spec)
: internal::ArgFormatterBase<Char>(buffer, spec) {}
using Base::operator();
@@ -295,7 +295,7 @@ class PrintfArgFormatter : public internal::ArgFormatterBase<Char> {
/** This template formats data and writes the output to a writer. */
template <typename Char,
typename ArgFormatter = PrintfArgFormatter<Char> >
typename ArgFormatter = printf_arg_formatter<Char> >
class printf_context :
private internal::context_base<
Char, printf_context<Char, ArgFormatter>> {