diff options
Diffstat (limited to 'contrib/libs/cxxsupp')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/include/complex | 3 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/patches/38-complex.patch | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/include/complex b/contrib/libs/cxxsupp/libcxx/include/complex index 91cf3f4d50..bfe61c506e 100644 --- a/contrib/libs/cxxsupp/libcxx/include/complex +++ b/contrib/libs/cxxsupp/libcxx/include/complex @@ -1282,8 +1282,7 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp> acos(const complex<_Tp>& __x) { } if (std::__constexpr_isinf(__x.imag())) return complex<_Tp>(__pi / _Tp(2), -__x.imag()); - // Somehow isnan can be a macro, so we use __constexpr_isnan - if (__x.real() == 0 && (__x.imag() == 0 || std::__constexpr_isnan(__x.imag()))) + if (__x.real() == 0 && (__x.imag() == 0 || std::isnan(__x.imag()))) return complex<_Tp>(__pi / _Tp(2), -__x.imag()); complex<_Tp> __z = std::log(__x + std::sqrt(std::__sqr(__x) - _Tp(1))); if (std::signbit(__x.imag())) diff --git a/contrib/libs/cxxsupp/libcxx/patches/38-complex.patch b/contrib/libs/cxxsupp/libcxx/patches/38-complex.patch deleted file mode 100644 index 6856a5f4b2..0000000000 --- a/contrib/libs/cxxsupp/libcxx/patches/38-complex.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/include/complex b/include/complex -index bfe61c5..91cf3f4 100644 ---- a/include/complex -+++ b/include/complex -@@ -1282,7 +1282,8 @@ _LIBCPP_HIDE_FROM_ABI complex<_Tp> acos(const complex<_Tp>& __x) { - } - if (std::__constexpr_isinf(__x.imag())) - return complex<_Tp>(__pi / _Tp(2), -__x.imag()); -- if (__x.real() == 0 && (__x.imag() == 0 || std::isnan(__x.imag()))) -+ // Somehow isnan can be a macro, so we use __constexpr_isnan -+ if (__x.real() == 0 && (__x.imag() == 0 || std::__constexpr_isnan(__x.imag()))) - return complex<_Tp>(__pi / _Tp(2), -__x.imag()); - complex<_Tp> __z = std::log(__x + std::sqrt(std::__sqr(__x) - _Tp(1))); - if (std::signbit(__x.imag())) |