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

Try improving error reporting

Browse Source 
when formatting wide strings into narrow.
This commit is contained in:
Victor Zverovich 2015-02-25 07:43:47 -08:00
parent 89fed501d4
commit bf14b2c41b
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
format.h
View File

@ -738,6 +738,20 @@ struct Arg : Value {
Type type; Type type;
}; };
struct None {};
template <typename T, typename Char>
struct WStringHelper {
typedef None Supported;
typedef T Unsupported;
};
template <typename T>
struct WStringHelper<T, wchar_t> {
typedef T Supported;
typedef None Unsupported;
};
// Makes a Value object from any type. // Makes a Value object from any type.
template <typename Char> template <typename Char>
class MakeValue : public Value { class MakeValue : public Value {
@ -752,6 +766,8 @@ class MakeValue : public Value {
template <typename T> template <typename T>
MakeValue(T *value); MakeValue(T *value);
MakeValue(typename WStringHelper<const wchar_t *, Char>::Unsupported);
void set_string(StringRef str) { void set_string(StringRef str) {
string.value = str.c_str(); string.value = str.c_str();
string.size = str.size(); string.size = str.size();
@ -833,10 +849,17 @@ class MakeValue : public Value {
FMT_MAKE_STR_VALUE(const std::string &, STRING) FMT_MAKE_STR_VALUE(const std::string &, STRING)
FMT_MAKE_STR_VALUE(StringRef, STRING) FMT_MAKE_STR_VALUE(StringRef, STRING)
FMT_MAKE_STR_VALUE(wchar_t *, WSTRING) MakeValue(wchar_t *value) { set_string(value); }
FMT_MAKE_STR_VALUE(const wchar_t *, WSTRING) MakeValue(typename WStringHelper<const wchar_t *, Char>::Supported value) {
FMT_MAKE_STR_VALUE(const std::wstring &, WSTRING) set_string(value);
FMT_MAKE_STR_VALUE(WStringRef, WSTRING) }
MakeValue(const std::wstring &value) { set_string(value); }
MakeValue(WStringRef value) { set_string(value); }
static uint64_t type(wchar_t *) { return Arg::WSTRING; }
static uint64_t type(const wchar_t *) { return Arg::WSTRING; }
static uint64_t type(const std::wstring &) { return Arg::WSTRING; }
static uint64_t type(WStringRef) { return Arg::WSTRING; }
FMT_MAKE_VALUE(void *, pointer, POINTER) FMT_MAKE_VALUE(void *, pointer, POINTER)
FMT_MAKE_VALUE(const void *, pointer, POINTER) FMT_MAKE_VALUE(const void *, pointer, POINTER)