[Libreoffice-commits] .: 2 commits - bridges/source sal/inc

[Libreoffice Gerrit user]

 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx |    7 +++++++
 sal/inc/sal/mathconf.h                          |   12 +++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit bef4daee6631f92e737df31af6d3a8779dfa9720
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Nov 3 09:32:16 2012 +0200

    WaE: unused parameter
    
    Change-Id: I3bc0896d1bb8c281e535d8a55ced1dec707b1d76

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
index 2d920df..e341285 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp.cxx
@@ -204,6 +204,13 @@ void callVirtualMethod(
 
 #ifdef __arm
 
+    // Implement!!!
+    abort();
+    (void) nVtableIndex;
+    (void) pRegisterReturn;
+    (void) pReturnTypeDescr;
+    (void) bSimpleReturn;
+
 #else
     volatile long edx = 0, eax = 0; // for register returns
     void * stackptr = 0;
commit 157995fa389596ef03b2c5fa8158a8285cc57803
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Nov 3 09:29:46 2012 +0200

    isfinite() is hard to get right
    
    Change-Id: Iae369a1b057d207f18c8c0ea8ac4fb5437ff1da5

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index 5a49e0b..1c12ec1 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -41,6 +41,14 @@
 #include <cmath>
 #endif
 
+#if defined(IOS)
+#if defined(__cplusplus)
+#include <cmath>
+#else
+#include <math.h>
+#endif
+#endif
+
 #if defined __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -65,7 +73,9 @@ extern "C" {
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
 #if !defined SOLARIS && !defined ANDROID \
                      && defined(__cplusplus) \
-                     && ( defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L )
+                     && ( defined(__GXX_EXPERIMENTAL_CXX0X__) \
+                          || __cplusplus >= 201103L \
+                          || defined(IOS) )
 #define SAL_MATH_FINITE(d) std::isfinite(d)
 #elif defined( IOS )
 #define SAL_MATH_FINITE(d) isfinite(d)