Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix more Visual Studio 2019 pedantic warnings #1371

Merged
merged 5 commits into from
Oct 23, 2019
Merged

Fix more Visual Studio 2019 pedantic warnings #1371

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5aa1b4d
format-inl.h(444,1): warning C4804: '>>': unsafe use of type 'bool' i…
chronoxor Oct 21, 2019
55b42e8
More fixes for VS2019 pedantic warnings
chronoxor Oct 21, 2019
ee339bc
Fix "conditional expression is constant" VS2019 warning in more speci…
chronoxor Oct 21, 2019
313c48b
Use const_check to silence constexpr warning
chronoxor Oct 22, 2019
2dc58f1
Use const_check to silence constexpr warning
chronoxor Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions include/fmt/format-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@

#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable : 4127) // conditional expression is constant
# pragma warning(disable : 4702) // unreachable code
#endif

Expand Down Expand Up @@ -441,7 +440,7 @@ class fp {
std::numeric_limits<float>::digits - 1);
if (min_normal_e > e) half_ulp <<= min_normal_e - e;
upper = normalize<0>(fp(f + half_ulp, e));
lower = fp(f - (half_ulp >> (f == implicit_bit && e > min_normal_e)), e);
lower = fp(f - (half_ulp >> ((f == implicit_bit && e > min_normal_e) ? 1 : 0)), e);
lower.f <<= lower.e - upper.e;
lower.e = upper.e;
}
Expand Down Expand Up @@ -939,7 +938,11 @@ template <int GRISU_VERSION> struct grisu_shortest_handler {
uint64_t error, int exp, bool integral) {
buf[size++] = digit;
if (remainder >= error) return digits::more;
#ifdef __cpp_if_constexpr
if constexpr (GRISU_VERSION != 3) {
#else
if (GRISU_VERSION != 3) {
#endif
chronoxor marked this conversation as resolved.
Show resolved Hide resolved
uint64_t d = integral ? diff : diff * data::powers_of_10_64[-exp];
round(d, divisor, remainder, error);
return digits::done;
Expand Down
4 changes: 4 additions & 0 deletions include/fmt/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2805,7 +2805,11 @@ void internal::basic_writer<Range>::write_fp(T value,
int precision = specs.precision >= 0 || !specs.type ? specs.precision : 6;
unsigned options = 0;
if (handler.fixed) options |= grisu_options::fixed;
#ifdef __cpp_if_constexpr
if constexpr (sizeof(value) == sizeof(float)) options |= grisu_options::binary32;
#else
if (sizeof(value) == sizeof(float)) options |= grisu_options::binary32;
#endif
bool use_grisu =
USE_GRISU &&
(specs.type != 'a' && specs.type != 'A' && specs.type != 'e' &&
Expand Down