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

Fix warnings under MSVC (#679)

Browse Source 
Closes #678.
This commit is contained in:
Jonathan Müller
2018-03-14 20:17:15 +01:00
committed by GitHub
parent 9c5f54a723
commit 4006678577
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/core.h
View File

@ -1064,8 +1064,9 @@ class basic_format_args {
unsigned max_size() const { unsigned max_size() const {
int64_t signed_types = static_cast<int64_t>(types_); int64_t signed_types = static_cast<int64_t>(types_);
return signed_types < 0 ? return static_cast<unsigned>(signed_types < 0
-signed_types : static_cast<int64_t>(internal::max_packed_args); ? -signed_types
: static_cast<int64_t>(internal::max_packed_args));
} }
}; };

12
include/fmt/format.h
View File

@ -1452,7 +1452,7 @@ class arg_formatter_base {
void operator()(const char_type *value) { void operator()(const char_type *value) {
internal::handle_cstring_type_spec( internal::handle_cstring_type_spec(
specs_.type_, cstring_spec_handler(*this, value)); static_cast<char>(specs_.type_), cstring_spec_handler(*this, value));
} }
void operator()(basic_string_view<char_type> value) { void operator()(basic_string_view<char_type> value) {
@ -1461,7 +1461,7 @@ class arg_formatter_base {
} }
void operator()(const void *value) { void operator()(const void *value) {
check_pointer_type_spec(specs_.type_, internal::error_handler()); check_pointer_type_spec(static_cast<char>(specs_.type_), internal::error_handler());
write_pointer(value); write_pointer(value);
} }
}; };
@ -2394,7 +2394,7 @@ class basic_writer {
void on_hex() { void on_hex() {
if (spec.flag(HASH_FLAG)) { if (spec.flag(HASH_FLAG)) {
prefix[prefix_size++] = '0'; prefix[prefix_size++] = '0';
prefix[prefix_size++] = spec.type(); prefix[prefix_size++] = static_cast<char>(spec.type());
} }
unsigned num_digits = count_digits<4>(); unsigned num_digits = count_digits<4>();
writer.write_int(num_digits, get_prefix(), spec, writer.write_int(num_digits, get_prefix(), spec,
@ -2415,7 +2415,7 @@ class basic_writer {
void on_bin() { void on_bin() {
if (spec.flag(HASH_FLAG)) { if (spec.flag(HASH_FLAG)) {
prefix[prefix_size++] = '0'; prefix[prefix_size++] = '0';
prefix[prefix_size++] = spec.type(); prefix[prefix_size++] = static_cast<char>(spec.type());
} }
unsigned num_digits = count_digits<1>(); unsigned num_digits = count_digits<1>();
writer.write_int(num_digits, get_prefix(), spec, writer.write_int(num_digits, get_prefix(), spec,
@ -2465,7 +2465,7 @@ class basic_writer {
// Writes a formatted integer. // Writes a formatted integer.
template <typename T, typename Spec> template <typename T, typename Spec>
void write_int(T value, const Spec &spec) { void write_int(T value, const Spec &spec) {
internal::handle_int_type_spec(spec.type(), internal::handle_int_type_spec(static_cast<char>(spec.type()),
int_writer<T, Spec>(*this, value, spec)); int_writer<T, Spec>(*this, value, spec));
} }
@ -2698,7 +2698,7 @@ template <typename T>
void basic_writer<Range>::write_double(T value, const format_specs &spec) { void basic_writer<Range>::write_double(T value, const format_specs &spec) {
// Check type. // Check type.
float_spec_handler<char_type> handler(spec.type()); float_spec_handler<char_type> handler(spec.type());
internal::handle_float_type_spec(spec.type(), handler); internal::handle_float_type_spec(static_cast<char>(spec.type()), handler);
char sign = 0; char sign = 0;
// Use isnegative instead of value < 0 because the latter is always // Use isnegative instead of value < 0 because the latter is always