diff --git a/include/fmt/core.h b/include/fmt/core.h index c70e0b98..6b956a6a 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -158,7 +158,7 @@ // libc++ supports string_view in pre-c++17. #if (FMT_HAS_INCLUDE() && \ (__cplusplus > 201402L || _LIBCPP_VERSION)) || \ - (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910) + (defined(_MSVC_LANG) && _MSVC_LANG > 201402L && _MSC_VER >= 1910) # include # define FMT_USE_STD_STRING_VIEW #elif (FMT_HAS_INCLUDE() && \ diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index a5f8a367..52111a13 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -337,7 +337,7 @@ FMT_FUNC fp operator*(fp x, fp y) { uint64_t ac = a * c, bc = b * c, ad = a * d, bd = b * d; // Compute mid 64-bit of result and round. uint64_t mid = (bd >> 32) + (ad & mask) + (bc & mask) + (1U << 31); - return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64); + return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64); } } // namespace internal diff --git a/include/fmt/format.h b/include/fmt/format.h index a0eab006..cf339682 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -255,7 +255,7 @@ struct fp { // Returns an fp number representing x - y. Result may not be normalized. inline fp operator-(fp x, fp y) { FMT_ASSERT(x.f >= y.f && x.e == y.e, "invalid operands"); - return fp(x.f - y.f, x.e); + return fp(x.f - y.f, x.e); } // Computes an fp number r with r.f = x.f * y.f / pow(2, 32) rounded to nearest @@ -1594,7 +1594,7 @@ class width_checker: public function { explicit FMT_CONSTEXPR width_checker(ErrorHandler &eh) : handler_(eh) {} template - FMT_CONSTEXPR + FMT_CONSTEXPR typename std::enable_if< is_integer::value, unsigned long long>::type operator()(T value) { if (is_negative(value))