Skip to content
Permalink
Browse files

Dont call method 'max' because its a reserved word / compiler macro o…

…n some platforms (MSVC) and causes build failures

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8141 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Feb 12, 2008
1 parent d59e00a commit 438c10c490b28cea8d66d98bdc58b071ee57cef0
Showing with 3 additions and 3 deletions.
  1. +2 −2 src/core/qgspoint.cpp
  2. +1 −1 src/core/qgspoint.h
@@ -99,7 +99,7 @@ int QgsPoint::onSegment(const QgsPoint& a, const QgsPoint& b) const
//algorithm from 'graphics GEMS', A. Paeth: 'A Fast 2D Point-on-line test'
if(
fabs( (b.y() - a.y()) * (m_x - a.x()) - (m_y - a.y()) * (b.x() - a.x())) \
>= max( fabs(b.x() - a.x()), fabs(b.y() - a.y()))
>= maxValue( fabs(b.x() - a.x()), fabs(b.y() - a.y()))
)
{
return 0;
@@ -124,7 +124,7 @@ int QgsPoint::onSegment(const QgsPoint& a, const QgsPoint& b) const
return 2;
}

double QgsPoint::max(double a, double b) const
double QgsPoint::maxValue(double a, double b) const
{
if(b > a)
{
@@ -129,7 +129,7 @@ class CORE_EXPORT QgsPoint

//! little helper function that returns the maximum of
//! two doubles (or a in case of equality)
double max(double a, double b) const;
double maxValue(double a, double b) const;

}; // class QgsPOint

0 comments on commit 438c10c

Please sign in to comment.
You can’t perform that action at this time.