Mercurial > hg > svcore

changeset 257:46398ab6ff58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* OS/X build fixes
author Chris Cannam
date Fri, 27 Apr 2007 16:10:10 +0000
parents 9c85517ff0f5
children 96a6dd889c68
files data/model/EditableDenseThreeDimensionalModel.cpp data/model/SparseValueModel.h
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/EditableDenseThreeDimensionalModel.cpp	Fri Apr 27 15:39:48 2007 +0000
+++ b/data/model/EditableDenseThreeDimensionalModel.cpp	Fri Apr 27 16:10:10 2007 +0000
@@ -178,7 +178,7 @@
 
     for (size_t i = 0; i < values.size(); ++i) {
         float value = values[i];
-        if (isnan(value) || isinf(value)) {
+        if (std::isnan(value) || std::isinf(value)) {
             continue;
         }
 	if (!m_haveExtents || value < m_minimum) {
--- a/data/model/SparseValueModel.h	Fri Apr 27 15:39:48 2007 +0000
+++ b/data/model/SparseValueModel.h	Fri Apr 27 16:10:10 2007 +0000
@@ -19,6 +19,8 @@
 #include "SparseModel.h"
 #include "base/UnitDatabase.h"
 
+#include <cmath>
+
 /**
  * Model containing sparse data (points with some properties) of which
  * one of the properties is an arbitrary float value.  The other
@@ -62,7 +64,7 @@
     {
 	bool allChange = false;
 
-        if (!isnan(point.value) && !isinf(point.value)) {
+        if (!std::isnan(point.value) && !std::isinf(point.value)) {
             if (!m_haveExtents || point.value < m_valueMinimum) {
                 m_valueMinimum = point.value; allChange = true;
             }