summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Buso <dev.siroibaf@gmail.com>2016-02-25 09:45:03 +0100
committerTor Lillqvist <tml@collabora.com>2016-02-25 16:34:16 +0000
commit36ae1972ff64c80dc053680c82032904f7bbdcb8 (patch)
tree2bc6343372618cdc3948996f5956c27bbea17c76
parent224ecda045f49a0e96d3117233b667de6d5c6837 (diff)
Use rtl::math::isNan()
isnan() not found causes compilation error System: Archlinux (Kernel Version 4.4) - GCC 5.3.0 Change-Id: Id0bb4555428896678437e8abf228f1c208f1e7a0 Reviewed-on: https://gerrit.libreoffice.org/22695 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--svx/source/items/e3ditem.cxx5
-rw-r--r--xmloff/source/draw/ximp3dscene.cxx3
2 files changed, 5 insertions, 3 deletions
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 9e623dcfcbee..9604bcecd2bc 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/drawing/Direction3D.hpp>
#include <tools/stream.hxx>
+#include <rtl/math.hxx>
#include <svx/e3ditem.hxx>
@@ -87,7 +88,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/
bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
- assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()));
+ assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ()));
drawing::Direction3D aDirection;
@@ -111,7 +112,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
aVal.setY(aDirection.DirectionY);
aVal.setZ(aDirection.DirectionZ);
- assert(!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()));
+ assert(!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ()));
return true;
}
diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
index 5cf205f1da9b..69fb32aef63f 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -18,6 +18,7 @@
*/
#include <sax/tools/converter.hxx>
+#include <rtl/math.hxx>
#include "ximp3dscene.hxx"
#include <xmloff/xmluconv.hxx>
@@ -66,7 +67,7 @@ SdXML3DLightContext::SdXML3DLightContext(
{
::basegfx::B3DVector aVal;
SvXMLUnitConverter::convertB3DVector(aVal, sValue);
- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
+ if (!rtl::math::isNan(aVal.getX()) && !rtl::math::isNan(aVal.getY()) && !rtl::math::isNan(aVal.getZ()))
{
maDirection = aVal;
}