External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for xcode build

Browse Source
This commit is contained in:
Arthur Danskin 2017-04-06 16:31:33 -04:00
parent dacb973dac
commit 74fc821cd6
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fmt/format.h
View File

@ -1283,6 +1283,30 @@ void format_arg(Formatter &, const Char *, const T &) {
"an overload of format_arg."); "an overload of format_arg.");
} }
template <typename Formatter>
class MakeArg;
// first argument to format_arg for custom formatters
template <typename AF>
class UserFormatter {
AF &af_;
public:
typedef AF ArgFormatter;
typedef typename AF::Char Char;
typedef MakeArg< UserFormatter > MakeArg;
UserFormatter(AF &af) : af_(af) {}
BasicWriter<typename AF::Char> &writer() { return af_.writer(); }
void visit(const Arg &arg) { af_.visit(arg); }
const Char *format(const Char *&format_str, const internal::Arg &arg)
{
af_.visit(format_str, arg);
}
};
// Makes an Arg object from any type. // Makes an Arg object from any type.
template <typename Formatter> template <typename Formatter>
@ -1485,28 +1509,6 @@ class RuntimeError : public std::runtime_error {
template <typename Char> template <typename Char>
class ArgMap; class ArgMap;
// first argument to format_arg for custom formatters
template <typename AF>
class UserFormatter {
AF &af_;
public:
typedef AF ArgFormatter;
typedef typename AF::Char Char;
typedef MakeArg< UserFormatter > MakeArg;
UserFormatter(AF &af) : af_(af) {}
BasicWriter<typename AF::Char> &writer() { return af_.writer(); }
void visit(const Arg &arg) { af_.visit(arg); }
const Char *format(const Char *&format_str, const internal::Arg &arg)
{
af_.visit(format_str, arg);
}
};
} // namespace internal } // namespace internal
@ -2183,7 +2185,7 @@ class BasicArgFormatter : public internal::ArgFormatterBase<Impl, Char, Spec> {
/** Formats an argument of a custom (user-defined) type. */ /** Formats an argument of a custom (user-defined) type. */
void visit_custom(internal::Arg::CustomValue c) { void visit_custom(internal::Arg::CustomValue c) {
UserFormatter<BasicArgFormatter> uf(*this); internal::UserFormatter<BasicArgFormatter> uf(*this);
c.format(&uf, c.value, &format_); c.format(&uf, c.value, &format_);
} }
}; };
@ -3744,7 +3746,7 @@ const Char *BasicFormatter<Char, ArgFormatter>::format(
typename ArgFormatter::SpecType spec; typename ArgFormatter::SpecType spec;
if (*s == ':') { if (*s == ':') {
if (arg.type == Arg::CUSTOM) { if (arg.type == Arg::CUSTOM) {
UserFormatter<BasicFormatter<Char, ArgFormatter> > uf(*this); internal::UserFormatter<BasicFormatter<Char, ArgFormatter> > uf(*this);
arg.custom.format(&uf, arg.custom.value, &s); arg.custom.format(&uf, arg.custom.value, &s);
return s; return s;
} }