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

Merge 713b8d5006 into 64a0016680

Browse Source
This commit is contained in:
chronoxor 2016-09-25 15:21:31 +00:00 committed by GitHub
commit 6e7eb5f4ca
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

@ -1015,6 +1015,7 @@ struct Value {
void *formatter, const void *arg, void *format_str_ptr);
struct CustomValue {
std::size_t size;
const void *value;
FormatFunc format;
};
@ -1314,6 +1315,7 @@ class MakeValue : public Arg {
MakeValue(const T &value,
typename EnableIf<Not<
ConvertToInt<T>::value>::value, int>::type = 0) {
custom.size = sizeof(T);
custom.value = &value;
custom.format = &format_custom_arg<T>;
}
@ -1388,10 +1390,13 @@ class ArgList {
};
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;
uint64_t mask = 0xf;
return static_cast<internal::Arg::Type>(
(types_ & (mask << shift)) >> shift);
(types & (mask << shift)) >> shift);
}
template <typename Char>
@ -1408,6 +1413,8 @@ class ArgList {
ArgList(ULongLong types, const internal::Arg *args)
: types_(types), args_(args) {}
uint64_t types() const { return types_; }
/** Returns the argument at specified index. */
internal::Arg operator[](unsigned index) const {
using internal::Arg;