diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-08-27 19:53:50 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 05:09:43 +0200 |
| commit | dac48f0417f818ef4e1ef8ba81be64def5154067 (patch) | |
| tree | daa1acd7c67b7d4c3716f53b49939f12db6ca431 /src/3rdparty | |
| parent | 64a5278704db4103018c73901c2f949c9df3afac (diff) | |
| download | qtlocation-dac48f0417f818ef4e1ef8ba81be64def5154067.tar.gz | |
Fix compilation on QNX
including <cmath> declares the standard maths functions in the std
namespace not the global namespace.
Change-Id: I293cba5ed166b4f122bb34bca5c1d508e2dda259
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/poly2tri/common/shapes.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/poly2tri/sweep/sweep.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/poly2tri/common/shapes.h b/src/3rdparty/poly2tri/common/shapes.h index 6d3f48cd..f147955a 100644 --- a/src/3rdparty/poly2tri/common/shapes.h +++ b/src/3rdparty/poly2tri/common/shapes.h @@ -105,7 +105,7 @@ struct Point { /// Get the length of this point (the norm). float Length() const { - return sqrt(x * x + y * y); + return std::sqrt(x * x + y * y); } /// Convert this point into a unit point. Returns the Length. diff --git a/src/3rdparty/poly2tri/sweep/sweep.cpp b/src/3rdparty/poly2tri/sweep/sweep.cpp index dd36d706..4df63038 100644 --- a/src/3rdparty/poly2tri/sweep/sweep.cpp +++ b/src/3rdparty/poly2tri/sweep/sweep.cpp @@ -28,6 +28,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <stddef.h> #include <stdexcept> #include "sweep.h" #include "sweep_context.h" |