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

Get rid of FMT_MAKE_WSTR_VALUE macro

Browse Source
This commit is contained in:
Victor Zverovich 2017-09-08 08:42:01 -07:00
parent fced79b0ee
commit a3191a9903
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fmt/format.h
View File

@ -1244,20 +1244,12 @@ class value {
value(const signed char *s) { set<CSTRING>(sstring.value, s); } value(const signed char *s) { set<CSTRING>(sstring.value, s); }
value(unsigned char *s) { set<CSTRING>(ustring.value, s); } value(unsigned char *s) { set<CSTRING>(ustring.value, s); }
value(const unsigned char *s) { set<CSTRING>(ustring.value, s); } value(const unsigned char *s) { set<CSTRING>(ustring.value, s); }
value(string_view s) { set_string<STRING>(string, s); } value(string_view s) { set_string(s); }
value(const std::string &s) { set_string<STRING>(string, s); } value(const std::string &s) { set_string(s); }
value(wstring_view s) { set_wstring(s); }
#define FMT_MAKE_WSTR_VALUE(Type, TYPE) \ value(const std::wstring &s) { set_wstring(s); }
value(Type value) { \ value(wchar_t *s) { set_wstring(wstring_view(s)); }
require_wchar<char_type>(); \ value(const wchar_t *s) { set_wstring(wstring_view(s)); }
static_assert(get_type<Type>() == TYPE, "invalid type"); \
set_string(value); \
}
FMT_MAKE_WSTR_VALUE(wchar_t *, TSTRING)
FMT_MAKE_WSTR_VALUE(const wchar_t *, TSTRING)
FMT_MAKE_WSTR_VALUE(wstring_view, TSTRING)
FMT_MAKE_WSTR_VALUE(const std::wstring &, TSTRING)
// Formatting of arbitrary pointers is disallowed. If you want to output a // Formatting of arbitrary pointers is disallowed. If you want to output a
// pointer cast it to "void *" or "const void *". In particular, this forbids // pointer cast it to "void *" or "const void *". In particular, this forbids
@ -1306,16 +1298,19 @@ class value {
field = value; field = value;
} }
template <type TYPE, typename T, typename U> template <typename T>
void set_string(T &field, const U &value) { void set_string(const T &value) {
static_assert(get_type<U>() == TYPE, "invalid type"); static_assert(get_type<T>() == STRING, "invalid type");
field.value = value.data(); string.value = value.data();
field.size = value.size(); string.size = value.size();
} }
void set_string(wstring_view str) { template <typename T>
this->tstring.value = str.data(); void set_wstring(const T &value) {
this->tstring.size = str.size(); require_wchar<char_type>();
static_assert(get_type<T>() == TSTRING, "invalid type");
tstring.value = value.data();
tstring.size = value.size();
} }
// 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.