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

Extend ArgLists to support serialization/deserialization in third-party components

Browse Source
This commit is contained in:
Ivan Shynkarenka 2016-09-25 18:20:39 +03:00
parent 1fb0586b06
commit 713b8d5006
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fmt/format.h
View File

@ -1004,6 +1004,7 @@ struct Value {
void *formatter, const void *arg, void *format_str_ptr); void *formatter, const void *arg, void *format_str_ptr);
struct CustomValue { struct CustomValue {
std::size_t size;
const void *value; const void *value;
FormatFunc format; FormatFunc format;
}; };
@ -1303,6 +1304,7 @@ class MakeValue : public Arg {
MakeValue(const T &value, MakeValue(const T &value,
typename EnableIf<Not< typename EnableIf<Not<
ConvertToInt<T>::value>::value, int>::type = 0) { ConvertToInt<T>::value>::value, int>::type = 0) {
custom.size = sizeof(T);
custom.value = &value; custom.value = &value;
custom.format = &format_custom_arg<T>; custom.format = &format_custom_arg<T>;
} }
@ -1377,10 +1379,13 @@ class ArgList {
}; };
internal::Arg::Type type(unsigned index) const { internal::Arg::Type type(unsigned index) const {
return type(types_, index);
}
static internal::Arg::Type type(uint64_t types, unsigned index) {
unsigned shift = index * 4; unsigned shift = index * 4;
uint64_t mask = 0xf; uint64_t mask = 0xf;
return static_cast<internal::Arg::Type>( return static_cast<internal::Arg::Type>(
(types_ & (mask << shift)) >> shift); (types & (mask << shift)) >> shift);
} }
template <typename Char> template <typename Char>
@ -1397,6 +1402,8 @@ class ArgList {
ArgList(ULongLong types, const internal::Arg *args) ArgList(ULongLong types, const internal::Arg *args)
: types_(types), args_(args) {} : types_(types), args_(args) {}
uint64_t types() const { return types_; }
/** Returns the argument at specified index. */ /** Returns the argument at specified index. */
internal::Arg operator[](unsigned index) const { internal::Arg operator[](unsigned index) const {
using internal::Arg; using internal::Arg;