fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Char -> char_type

Browse Source
This commit is contained in:
Victor Zverovich
2016-10-22 08:19:19 -07:00
parent f85d5f4dac
commit be613204ab
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fmt/format.h
View File

@ -1234,7 +1234,7 @@ constexpr Type type() { return gettype<typename std::decay<T>::type>(); }
template <typename Formatter> template <typename Formatter>
class MakeValue : public Arg { class MakeValue : public Arg {
public: public:
typedef typename Formatter::Char Char; typedef typename Formatter::char_type Char;
private: private:
// The following two methods are private to disallow formatting of // The following two methods are private to disallow formatting of
@ -2194,12 +2194,12 @@ class ArgFormatter : public BasicArgFormatter<ArgFormatter<Char>, Char> {
}; };
/** This template formats data and writes the output to a writer. */ /** This template formats data and writes the output to a writer. */
template <typename CharType, typename ArgFormatter> template <typename Char, typename ArgFormatter>
class basic_formatter : class basic_formatter :
private internal::FormatterBase<basic_formatter<CharType, ArgFormatter>> { private internal::FormatterBase<basic_formatter<Char, ArgFormatter>> {
public: public:
/** The character type for the output. */ /** The character type for the output. */
typedef CharType Char; typedef Char char_type;
private: private:
BasicWriter<Char> &writer_; BasicWriter<Char> &writer_;

8
fmt/printf.h
View File

@ -281,13 +281,13 @@ class PrintfArgFormatter
}; };
/** This template formats data and writes the output to a writer. */ /** This template formats data and writes the output to a writer. */
template <typename CharType, template <typename Char,
typename ArgFormatter = PrintfArgFormatter<CharType> > typename ArgFormatter = PrintfArgFormatter<Char> >
class PrintfFormatter : class PrintfFormatter :
private internal::FormatterBase<PrintfFormatter<CharType, ArgFormatter>> { private internal::FormatterBase<PrintfFormatter<Char, ArgFormatter>> {
public: public:
/** The character type for the output. */ /** The character type for the output. */
typedef CharType Char; typedef Char char_type;
private: private:
BasicWriter<Char> &writer_; BasicWriter<Char> &writer_;

2
test/util-test.cc
View File

@ -578,7 +578,7 @@ TEST(UtilTest, FormatArgs) {
} }
struct CustomFormatter { struct CustomFormatter {
typedef char Char; typedef char char_type;
}; };
void format_value(CustomFormatter &, const char *&s, const Test &) { void format_value(CustomFormatter &, const char *&s, const Test &) {