From: Krystian Kuźniarek Date: Thu, 10 Sep 2020 16:09:16 +0000 (+0100) Subject: libstdc++: Add parentheses around assignments used as truth values X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef8b4335d9de68082e7fb41a8c505b90cfc71cb9;p=gcc.git libstdc++: Add parentheses around assignments used as truth values libstdc++-v3/ChangeLog: * include/c_global/cmath (__lerp): Avoid -Wparentheses warnings. --- diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath index b99aaf8df40..25080511722 100644 --- a/libstdc++-v3/include/c_global/cmath +++ b/libstdc++-v3/include/c_global/cmath @@ -1893,7 +1893,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr _Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept { - if (__a <= 0 && __b >= 0 || __a >= 0 && __b <= 0) + if ((__a <= 0 && __b >= 0) || (__a >= 0 && __b <= 0)) return __t * __b + (1 - __t) * __a; if (__t == 1) @@ -1902,7 +1902,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Exact at __t=0, monotonic except near __t=1, // bounded, determinate, and consistent: const _Fp __x = __a + __t * (__b - __a); - return __t > 1 == __b > __a + return (__t > 1) == (__b > __a) ? (__b < __x ? __x : __b) : (__b > __x ? __x : __b); // monotonic near __t=1 }