From 476dbf1c33de6361a1b180f641cd8a86bd9e0452 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 2 May 2012 13:58:34 +0000 Subject: [PATCH] Fixed for including cmath before osg/Math. --- include/osg/Math | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/osg/Math b/include/osg/Math index 7d85722e6..487255581 100644 --- a/include/osg/Math +++ b/include/osg/Math @@ -216,9 +216,14 @@ inline double round(double v) { return v>=0.0?floor(v+0.5):ceil(v-0.5); } inline bool isNaN(float v) { return std::isnan(v); } inline bool isNaN(double v) { return std::isnan(v); } #else - // Need to use to std::isnan to avoid undef problem from - inline bool isNaN(float v) { return isnan(v); } - inline bool isNaN(double v) { return isnan(v); } + #ifdef isnan + inline bool isNaN(float v) { return isnan(v); } + inline bool isNaN(double v) { return isnan(v); } + #else + // Need to use to std::isnan to avoid undef problem from + inline bool isNaN(float v) { return std::isnan(v); } + inline bool isNaN(double v) { return std::isnan(v); } + #endif #endif #endif