Skip to content

Commit fd86c81

Browse files
author
mhugent
committed
Fix for bug #1854 qgisinterpolator.cpp causing build error on OS X
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11274 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c4511e0 commit fd86c81

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

src/core/qgis.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#define QGIS_H
2121
#include <QEvent>
2222
#include <QString>
23-
#include <cmath>
2423
#include <cfloat>
24+
2525
/** \ingroup core
2626
* The QGis class provides global constants for use throughout the application.
2727
*/

src/plugins/interpolation/MathUtils.h

+4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
#ifndef MATHUTILS_H
1818
#define MATHUTILS_H
1919

20+
#ifndef Q_OS_MACX
2021
#include <cmath>
22+
#else
23+
#include <math.h>
24+
#endif
2125
#include "Vector3D.h"
2226
#include "Point3D.h"
2327

src/plugins/interpolation/Point3D.h

+4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
#ifndef POINT3D_H
1818
#define POINT3D_H
1919

20+
#ifndef Q_OS_MACX
2021
#include <cmath>
22+
#else
23+
#include <math.h>
24+
#endif
2125
#include <iostream>
2226

2327
/**Point3D is a class to represent a three dimensional point*/

src/plugins/interpolation/Vector3D.h

+4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
#ifndef VECTOR3D_H
1818
#define VECTOR3D_H
1919

20+
#ifndef Q_OS_MACX
2021
#include <cmath>
22+
#else
23+
#include <math.h>
24+
#endif
2125

2226
class Vector3D
2327
/**

0 commit comments

Comments
 (0)