[QGIS Commit] r11274 - in trunk/qgis/src: core plugins/interpolation
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Wed Aug 5 09:25:06 EDT 2009
Author: mhugent
Date: 2009-08-05 09:25:06 -0400 (Wed, 05 Aug 2009)
New Revision: 11274
Modified:
trunk/qgis/src/core/qgis.h
trunk/qgis/src/plugins/interpolation/MathUtils.h
trunk/qgis/src/plugins/interpolation/Point3D.h
trunk/qgis/src/plugins/interpolation/Vector3D.h
Log:
Fix for bug #1854 qgisinterpolator.cpp causing build error on OS X
Modified: trunk/qgis/src/core/qgis.h
===================================================================
--- trunk/qgis/src/core/qgis.h 2009-08-05 12:35:23 UTC (rev 11273)
+++ trunk/qgis/src/core/qgis.h 2009-08-05 13:25:06 UTC (rev 11274)
@@ -20,8 +20,8 @@
#define QGIS_H
#include <QEvent>
#include <QString>
-#include <cmath>
#include <cfloat>
+
/** \ingroup core
* The QGis class provides global constants for use throughout the application.
*/
Modified: trunk/qgis/src/plugins/interpolation/MathUtils.h
===================================================================
--- trunk/qgis/src/plugins/interpolation/MathUtils.h 2009-08-05 12:35:23 UTC (rev 11273)
+++ trunk/qgis/src/plugins/interpolation/MathUtils.h 2009-08-05 13:25:06 UTC (rev 11274)
@@ -17,7 +17,11 @@
#ifndef MATHUTILS_H
#define MATHUTILS_H
+#ifndef Q_OS_MACX
#include <cmath>
+#else
+#include <math.h>
+#endif
#include "Vector3D.h"
#include "Point3D.h"
Modified: trunk/qgis/src/plugins/interpolation/Point3D.h
===================================================================
--- trunk/qgis/src/plugins/interpolation/Point3D.h 2009-08-05 12:35:23 UTC (rev 11273)
+++ trunk/qgis/src/plugins/interpolation/Point3D.h 2009-08-05 13:25:06 UTC (rev 11274)
@@ -17,7 +17,11 @@
#ifndef POINT3D_H
#define POINT3D_H
+#ifndef Q_OS_MACX
#include <cmath>
+#else
+#include <math.h>
+#endif
#include <iostream>
/**Point3D is a class to represent a three dimensional point*/
Modified: trunk/qgis/src/plugins/interpolation/Vector3D.h
===================================================================
--- trunk/qgis/src/plugins/interpolation/Vector3D.h 2009-08-05 12:35:23 UTC (rev 11273)
+++ trunk/qgis/src/plugins/interpolation/Vector3D.h 2009-08-05 13:25:06 UTC (rev 11274)
@@ -17,7 +17,11 @@
#ifndef VECTOR3D_H
#define VECTOR3D_H
+#ifndef Q_OS_MACX
#include <cmath>
+#else
+#include <math.h>
+#endif
class Vector3D
/**
More information about the QGIS-commit
mailing list