fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 18:57:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

packed_arg_bitsize -> packed_arg_bits and remove packed_arg_mask

Browse Source
This commit is contained in:
Victor Zverovich
2019-10-18 07:43:46 -07:00
parent 36d1390e67
commit bb728a572a
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/fmt/core.h
View File

@ -893,12 +893,9 @@ using mapped_type_constant =
type_constant<decltype(arg_mapper<Context>().map(std::declval<T>())), type_constant<decltype(arg_mapper<Context>().map(std::declval<T>())),
typename Context::char_type>; typename Context::char_type>;
enum { packed_arg_bits = 5 };
// Maximum number of arguments with packed types. // Maximum number of arguments with packed types.
enum { enum { max_packed_args = 63 / packed_arg_bits };
packed_arg_bitsize = 5,
packed_arg_mask = (1 << packed_arg_bitsize) - 1,
max_packed_args = 63 / packed_arg_bitsize,
};
enum : unsigned long long { is_unpacked_bit = 1ull << 63 }; enum : unsigned long long { is_unpacked_bit = 1ull << 63 };
template <typename Context> class arg_map; template <typename Context> class arg_map;
@ -1063,7 +1060,7 @@ template <typename> constexpr unsigned long long encode_types() { return 0; }
template <typename Context, typename Arg, typename... Args> template <typename Context, typename Arg, typename... Args>
constexpr unsigned long long encode_types() { constexpr unsigned long long encode_types() {
return mapped_type_constant<Arg, Context>::value | return mapped_type_constant<Arg, Context>::value |
(encode_types<Context, Args...>() << packed_arg_bitsize); (encode_types<Context, Args...>() << packed_arg_bits);
} }
template <typename Context, typename T> template <typename Context, typename T>
@ -1208,9 +1205,9 @@ template <typename Context> class basic_format_args {
bool is_packed() const { return (types_ & internal::is_unpacked_bit) == 0; } bool is_packed() const { return (types_ & internal::is_unpacked_bit) == 0; }
internal::type type(int index) const { internal::type type(int index) const {
int shift = index * internal::packed_arg_bitsize; int shift = index * internal::packed_arg_bits;
return static_cast<internal::type>((types_ >> shift) & int mask = (1 << internal::packed_arg_bits) - 1;
internal::packed_arg_mask); return static_cast<internal::type>((types_ >> shift) & mask);
} }
friend class internal::arg_map<Context>; friend class internal::arg_map<Context>;