diff options
| author | Yukio Siraichi <yukio.siraichi@gmail.com> | 2020-03-12 19:45:07 +0900 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-03-12 20:06:13 +0100 |
| commit | c95529ed8eee120c109cd6fc7c94f615606586b0 (patch) | |
| tree | aedfdc7ee4ac490d52d22b672b536bda4a322f00 /sal | |
| parent | Revert "loplugin:constfields in slideshow" (diff) | |
| download | core-c95529ed8eee120c109cd6fc7c94f615606586b0.tar.gz core-c95529ed8eee120c109cd6fc7c94f615606586b0.zip | |
tdf#130976 replace `rtl::math::isInf` with `std::inf`.
Change-Id: Id0f0e07b324230d2d69cbf4ab07b0fff5b24474d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90377
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/rtl/math/test-rtl-math.cxx | 20 | ||||
| -rw-r--r-- | sal/rtl/math.cxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sal/qa/rtl/math/test-rtl-math.cxx b/sal/qa/rtl/math/test-rtl-math.cxx index af45eded639e..43d8e90afffc 100644 --- a/sal/qa/rtl/math/test-rtl-math.cxx +++ b/sal/qa/rtl/math/test-rtl-math.cxx @@ -79,14 +79,14 @@ public: '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); res = rtl::math::stringToDouble( OUString("INF1.23"), '.', ',', &status, &end); CPPUNIT_ASSERT_EQUAL(rtl_math_ConversionStatus_OutOfRange, status); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), end); - CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); res = rtl::math::stringToDouble( OUString(".5"), @@ -402,7 +402,7 @@ public: CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res)); rtl::math::setInf( &x, false); res = rtl::math::expm1(x); - CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && !rtl::math::isSignBitSet(res)); + CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && !rtl::math::isSignBitSet(res)); rtl::math::setInf( &x, true); res = rtl::math::expm1(x); CPPUNIT_ASSERT_EQUAL(-1.0,res); @@ -422,10 +422,10 @@ public: CPPUNIT_ASSERT_EQUAL(true, rtl::math::isSignBitSet(res)); rtl::math::setInf( &x, false); res = rtl::math::log1p(x); - CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && !rtl::math::isSignBitSet(res)); + CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && !rtl::math::isSignBitSet(res)); x = -1.0; res = rtl::math::log1p(x); - CPPUNIT_ASSERT_EQUAL(true, rtl::math::isInf(res) && rtl::math::isSignBitSet(res)); + CPPUNIT_ASSERT_EQUAL(true, std::isinf(res) && rtl::math::isSignBitSet(res)); x = -1.1; res = rtl::math::log1p(x); CPPUNIT_ASSERT_EQUAL(true, rtl::math::isNan(res)); @@ -453,7 +453,7 @@ public: res = rtl::math::acosh(std::numeric_limits<double>::infinity()); // +Inf CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res)); - CPPUNIT_ASSERT(rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); // #i97605 CPPUNIT_ASSERT_DOUBLES_EQUAL(692.56728736744176, rtl::math::acosh(3e+300), 1e-15); @@ -465,13 +465,13 @@ public: res = rtl::math::asinh(-std::numeric_limits<double>::infinity()); // -Inf CPPUNIT_ASSERT(rtl::math::isSignBitSet(res)); - CPPUNIT_ASSERT(rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); CPPUNIT_ASSERT_EQUAL(0.0, rtl::math::asinh(0.0)); res = rtl::math::asinh(std::numeric_limits<double>::infinity()); // +Inf CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res)); - CPPUNIT_ASSERT(rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); // #i97605 CPPUNIT_ASSERT_DOUBLES_EQUAL(691.67568924815798, rtl::math::asinh(1.23e+300), 1e-15); @@ -492,13 +492,13 @@ public: res = rtl::math::atanh(-1.0); // -Inf CPPUNIT_ASSERT(rtl::math::isSignBitSet(res)); - CPPUNIT_ASSERT(rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); CPPUNIT_ASSERT_EQUAL(0.0, rtl::math::atanh(0.0)); res = rtl::math::atanh(1.0); // +Inf CPPUNIT_ASSERT(!rtl::math::isSignBitSet(res)); - CPPUNIT_ASSERT(rtl::math::isInf(res)); + CPPUNIT_ASSERT(std::isinf(res)); res = rtl::math::atanh(2.0); // NaN CPPUNIT_ASSERT(rtl::math::isNan(res)); diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx index 5f52b96a34c7..31de7f718b09 100644 --- a/sal/rtl/math.cxx +++ b/sal/rtl/math.cxx @@ -259,7 +259,7 @@ void doubleToString(typename T::String ** pResult, } bool bHuge = fValue == HUGE_VAL; // g++ 3.0.1 requires it this way... - if (bHuge || rtl::math::isInf(fValue)) + if (bHuge || std::isinf(fValue)) { // #i112652# XMLSchema-2 sal_Int32 nCapacity = RTL_CONSTASCII_LENGTH("-INF"); |