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

clang-format

Browse Source
This commit is contained in:
Victor Zverovich
2019-07-18 06:28:53 +02:00
parent ec24342b2b
commit e9b9b0aefa
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/core.h
View File

@ -1201,8 +1201,8 @@ template <typename Context> class basic_format_args {
int max_size() const { int max_size() const {
unsigned long long max_packed = internal::max_packed_args; unsigned long long max_packed = internal::max_packed_args;
return static_cast<int>( return static_cast<int>(is_packed() ? max_packed
is_packed() ? max_packed : types_ & ~internal::is_unpacked_bit); : types_ & ~internal::is_unpacked_bit);
} }
}; };

13
include/fmt/format.h
View File

@ -1588,7 +1588,7 @@ template <typename Range> class basic_writer {
template <typename F> void write_padded(const format_specs& specs, F&& f) { template <typename F> void write_padded(const format_specs& specs, F&& f) {
// User-perceived width (in code points). // User-perceived width (in code points).
unsigned width = to_unsigned(specs.width); unsigned width = to_unsigned(specs.width);
size_t size = f.size(); // The number of code units. size_t size = f.size(); // The number of code units.
size_t num_code_points = width != 0 ? f.width() : size; size_t num_code_points = width != 0 ? f.width() : size;
if (width <= num_code_points) return f(reserve(size)); if (width <= num_code_points) return f(reserve(size));
auto&& it = reserve(width + (size - num_code_points)); auto&& it = reserve(width + (size - num_code_points));
@ -2111,7 +2111,8 @@ struct string_view_metadata {
template <typename Char> template <typename Char>
FMT_CONSTEXPR string_view_metadata(basic_string_view<Char> primary_string, FMT_CONSTEXPR string_view_metadata(basic_string_view<Char> primary_string,
basic_string_view<Char> view) basic_string_view<Char> view)
: offset_(to_unsigned(view.data() - primary_string.data())), size_(view.size()) {} : offset_(to_unsigned(view.data() - primary_string.data())),
size_(view.size()) {}
FMT_CONSTEXPR string_view_metadata(std::size_t offset, std::size_t size) FMT_CONSTEXPR string_view_metadata(std::size_t offset, std::size_t size)
: offset_(offset), size_(size) {} : offset_(offset), size_(size) {}
template <typename Char> template <typename Char>
@ -2202,8 +2203,8 @@ class dynamic_specs_handler
FMT_CONSTEXPR arg_ref_type make_arg_ref(basic_string_view<char_type> arg_id) { FMT_CONSTEXPR arg_ref_type make_arg_ref(basic_string_view<char_type> arg_id) {
context_.check_arg_id(arg_id); context_.check_arg_id(arg_id);
basic_string_view<char_type> format_str(context_.begin(), basic_string_view<char_type> format_str(
to_unsigned(context_.end() - context_.begin())); context_.begin(), to_unsigned(context_.end() - context_.begin()));
const auto id_metadata = string_view_metadata(format_str, arg_id); const auto id_metadata = string_view_metadata(format_str, arg_id);
return arg_ref_type(id_metadata); return arg_ref_type(id_metadata);
} }
@ -2257,9 +2258,7 @@ template <typename SpecHandler, typename Char> struct precision_adapter {
explicit FMT_CONSTEXPR precision_adapter(SpecHandler& h) : handler(h) {} explicit FMT_CONSTEXPR precision_adapter(SpecHandler& h) : handler(h) {}
FMT_CONSTEXPR void operator()() { handler.on_dynamic_precision(auto_id()); } FMT_CONSTEXPR void operator()() { handler.on_dynamic_precision(auto_id()); }
FMT_CONSTEXPR void operator()(int id) { FMT_CONSTEXPR void operator()(int id) { handler.on_dynamic_precision(id); }
handler.on_dynamic_precision(id);
}
FMT_CONSTEXPR void operator()(basic_string_view<Char> id) { FMT_CONSTEXPR void operator()(basic_string_view<Char> id) {
handler.on_dynamic_precision(id); handler.on_dynamic_precision(id);
} }