From f4fadeb63b902fd09227b8a4128c76f6e32a0b71 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 7 Jan 2015 11:07:30 +0100 Subject: scaddins: fix Android build _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 --- scaddins/source/analysis/analysis.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index d124a794e0fc..20edfc679949 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -38,6 +38,7 @@ #define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl" using namespace ::com::sun::star; +using namespace std; extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory( 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 ) 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 ); } -- cgit