[Libreoffice-commits] core.git: 2 commits - basegfx/test sal/rtl

[Tor Lillqvist]

 basegfx/test/boxclipper.cxx |    3 +--
 sal/rtl/math.cxx            |    8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit cc906ec47eaaad247e8fbed5c9e6f3604a8b64c7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 26 08:13:43 2015 +0200

    The Android NDK for some reason don't have these math functions in std::
    
    Not even if one includes <cmath> instead of <math.h>. So just use the
    C functions then.
    
    Change-Id: Ic8499bc7bcd5c84b6e52e1d5dc799f9f058db816

diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 05a1033..e0154f7 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -972,12 +972,12 @@ double SAL_CALL rtl_math_approxValue( double fValue ) SAL_THROW_EXTERN_C()
 
 double SAL_CALL rtl_math_expm1( double fValue ) SAL_THROW_EXTERN_C()
 {
-    return ::std::expm1(fValue);
+    return expm1(fValue);
 }
 
 double SAL_CALL rtl_math_log1p( double fValue ) SAL_THROW_EXTERN_C()
 {
-    return ::std::log1p(fValue);
+    return log1p(fValue);
 }
 
 double SAL_CALL rtl_math_atanh( double fValue ) SAL_THROW_EXTERN_C()
@@ -988,13 +988,13 @@ double SAL_CALL rtl_math_atanh( double fValue ) SAL_THROW_EXTERN_C()
 /** Parent error function (erf) */
 double SAL_CALL rtl_math_erf( double x ) SAL_THROW_EXTERN_C()
 {
-    return ::std::erf(x);
+    return erf(x);
 }
 
 /** Parent complementary error function (erfc) */
 double SAL_CALL rtl_math_erfc( double x ) SAL_THROW_EXTERN_C()
 {
-    return ::std::erfc(x);
+    return erfc(x);
 }
 
 /** improved accuracy of asinh for |x| large and for x near zero
commit cf35dbd17abefd50cca2e9219e72787ccd2889f0
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Oct 26 07:55:52 2015 +0200

    WaE: loplugin:defaultparams
    
    Change-Id: Ibb93059d4adab6b672cb9122b2dc8fe8af5bbbd6

diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index 92edbdb..7e0bfa5 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -167,8 +167,7 @@ public:
         std::for_each(randomPoly.begin(),
                       randomPoly.end(),
                       [this](const B2DPolygon& aPolygon) mutable {
-                          this->aRandomIntersections.appendElement(aPolygon.getB2DRange(),
-                              B2VectorOrientation::Negative, 1); } );
+                          this->aRandomIntersections.appendElement(aPolygon.getB2DRange(), B2VectorOrientation::Negative); } );
 #endif
     }