mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scaddins: fix Android build

Browse Source 
_GLIBCXX_USE_C99_MATH_TR1 is defined on Linux, so nextafter() is
imported into the std namespace, but it isn't defined on Android. So
just import the whole namespace to make both happy.

Change-Id: I8a94198ff65557e64d4ea9f833e3eee5e1aa26ec
This commit is contained in:
Miklos Vajna
2015-01-07 11:07:30 +01:00
parent 8eda0f7b07
commit f4fadeb63b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scaddins/source/analysis/analysis.cxx
View File

@@ -38,6 +38,7 @@
#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl" #define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace std;
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ ) const sal_Char* pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
@@ -702,7 +703,7 @@ double SAL_CALL AnalysisAddIn::getRandbetween( double fMin, double fMax ) throw(
if( fMin > fMax ) if( fMin > fMax )
throw lang::IllegalArgumentException(); throw lang::IllegalArgumentException();
double fRet = floor(comphelper::rng::uniform_real_distribution(fMin, std::nextafter(fMax+1, -DBL_MAX))); double fRet = floor(comphelper::rng::uniform_real_distribution(fMin, nextafter(fMax+1, -DBL_MAX)));
RETURN_FINITE( fRet ); RETURN_FINITE( fRet );
} }