mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-10-02 13:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build.

Browse Source
This commit is contained in:
Victor Zverovich 2014-06-28 17:44:52 -07:00
parent 4d5b1e8a13
commit ddbd50de4a
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format.cc
View File

@ -179,11 +179,11 @@ const uint64_t fmt::internal::POWERS_OF_10_64[] = {
void fmt::internal::ReportUnknownType(char code, const char *type) { void fmt::internal::ReportUnknownType(char code, const char *type) {
if (std::isprint(static_cast<unsigned char>(code))) { if (std::isprint(static_cast<unsigned char>(code))) {
throw fmt::FormatError(fmt::str( throw fmt::FormatError(fmt::str(
fmt::Format("unknown format code '{}' for {}") << code << type)); fmt::format("unknown format code '{}' for {}", code, type)));
} }
throw fmt::FormatError( throw fmt::FormatError(
fmt::str(fmt::Format("unknown format code '\\x{:02x}' for {}") fmt::str(fmt::format("unknown format code '\\x{:02x}' for {}",
<< static_cast<unsigned>(code) << type)); static_cast<unsigned>(code), type)));
} }
#ifdef _WIN32 #ifdef _WIN32
@ -569,11 +569,11 @@ void fmt::BasicWriter<Char>::FormatParser::CheckSign(
char sign = static_cast<char>(*s); char sign = static_cast<char>(*s);
if (arg.type > Arg::LAST_NUMERIC_TYPE) { if (arg.type > Arg::LAST_NUMERIC_TYPE) {
report_error_(s, report_error_(s,
fmt::Format("format specifier '{}' requires numeric argument") << sign); fmt::c_str(fmt::format("format specifier '{}' requires numeric argument", sign)));
} }
if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) { if (arg.type == Arg::UINT || arg.type == Arg::ULONG_LONG) {
report_error_(s, report_error_(s,
fmt::Format("format specifier '{}' requires signed argument") << sign); fmt::c_str(fmt::format("format specifier '{}' requires signed argument", sign)));
} }
++s; ++s;
} }

21
format.h
View File

@ -859,7 +859,9 @@ inline StrFormatSpec<wchar_t> pad(
return StrFormatSpec<wchar_t>(str, width, fill); return StrFormatSpec<wchar_t>(str, width, fill);
} }
// An argument list. /**
An argument list.
*/
class ArgList { class ArgList {
private: private:
const internal::ArgInfo *args_; const internal::ArgInfo *args_;
@ -1398,17 +1400,21 @@ class BasicWriter {
// This function is deprecated, use write instead. // This function is deprecated, use write instead.
FMT_DEPRECATED(void Write(const std::basic_string<Char> &s, const FormatSpec &spec)); FMT_DEPRECATED(void Write(const std::basic_string<Char> &s, const FormatSpec &spec));
void Write(const std::basic_string<Char> &s, const FormatSpec &spec) {
write(s, spec);
}
void clear() { buffer_.clear(); } void clear() { buffer_.clear(); }
// This function is deprecated, use clear instead. // This function is deprecated, use clear instead.
FMT_DEPRECATED(void Clear()); FMT_DEPRECATED(void Clear());
void Clear() { clear(); }
}; };
template <typename Char>
inline void BasicWriter<Char>::Write(const std::basic_string<Char> &s, const FormatSpec &spec) {
write(s, spec);
}
template <typename Char>
inline void BasicWriter<Char>::Clear() { clear(); }
template <typename Char> template <typename Char>
template <typename StringChar> template <typename StringChar>
typename BasicWriter<Char>::CharPtr BasicWriter<Char>::FormatString( typename BasicWriter<Char>::CharPtr BasicWriter<Char>::FormatString(
@ -1595,7 +1601,7 @@ namespace internal {
// Formats an argument of a custom type, such as a user-defined class. // Formats an argument of a custom type, such as a user-defined class.
template <typename Char, typename T> template <typename Char, typename T>
void FormatCustomArg(void *writer, const void *arg, const FormatSpec &spec) { void FormatCustomArg(void *writer, const void *arg, const FormatSpec &spec) {
Format(*static_cast<BasicWriter<Char>*>(writer), format(*static_cast<BasicWriter<Char>*>(writer),
spec, *static_cast<const T*>(arg)); spec, *static_cast<const T*>(arg));
} }
} }
@ -1823,9 +1829,8 @@ inline Formatter<> Format(StringRef format) {
return f; return f;
} }
// This function is deprecated, use format instead. // This function is deprecated, use format instead.
FMT_DEPRECATED(Formatter<NullSink, wchar_t> Format(WStringRef format)); Formatter<NullSink, wchar_t> FMT_DEPRECATED(Format(WStringRef format));
inline Formatter<NullSink, wchar_t> Format(WStringRef format) { inline Formatter<NullSink, wchar_t> Format(WStringRef format) {
Formatter<NullSink, wchar_t> f(format); Formatter<NullSink, wchar_t> f(format);
return f; return f;