cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build with g++4, which does have those isnan

Browse Source
This commit is contained in:
espie 2010-05-23 17:50:56 +00:00
parent 1285b2cbb4
commit c0a226b255
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
geo/qgis/patches/patch-src_analysis_interpolation_qgsinterpolator_cpp
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-src_analysis_interpolation_qgsinterpolator_cpp,v 1.1 2009/10/29 19:59:38 landry Exp $ $OpenBSD: patch-src_analysis_interpolation_qgsinterpolator_cpp,v 1.2 2010/05/23 17:50:56 espie Exp $
--- src/analysis/interpolation/qgsinterpolator.cpp.orig Tue Oct 27 20:45:47 2009 --- src/analysis/interpolation/qgsinterpolator.cpp.orig Sat Nov 28 18:07:29 2009
+++ src/analysis/interpolation/qgsinterpolator.cpp Tue Oct 27 20:46:01 2009 +++ src/analysis/interpolation/qgsinterpolator.cpp Sun May 23 19:45:34 2010
@@ -92,7 +92,7 @@ int QgsInterpolator::cacheBaseData() @@ -28,6 +28,11 @@
continue; #define isnan(f) _isnan(f)
} #endif
attributeValue = att_it.value().toDouble( &attributeConversionOk );
- if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation +#if __GNUC__ >= 4
+ if ( !attributeConversionOk || __gnu_cxx::isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation +using std::isnan;
{ +#else
continue; +using __gnu_cxx::isnan;
} +#endif
QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData ): mDataIsCached( false ), mLayerData( layerData )
{

25
geo/qgis/patches/patch-src_analysis_interpolation_qgstininterpolator_cpp
View File

@ -1,12 +1,15 @@
$OpenBSD: patch-src_analysis_interpolation_qgstininterpolator_cpp,v 1.2 2010/01/11 20:13:31 landry Exp $ $OpenBSD: patch-src_analysis_interpolation_qgstininterpolator_cpp,v 1.3 2010/05/23 17:50:56 espie Exp $
--- src/analysis/interpolation/qgstininterpolator.cpp.orig Sun Nov 22 15:41:00 2009 --- src/analysis/interpolation/qgstininterpolator.cpp.orig Sun Nov 22 15:41:00 2009
+++ src/analysis/interpolation/qgstininterpolator.cpp Mon Jan 11 16:39:31 2010 +++ src/analysis/interpolation/qgstininterpolator.cpp Sun May 23 19:46:46 2010
@@ -195,7 +195,7 @@ int QgsTINInterpolator::insertData( QgsFeature* f, boo @@ -36,6 +36,11 @@
return 3; #include <float.h>
} #define isnan(f) _isnan(f)
attributeValue = att_it.value().toDouble( &attributeConversionOk ); #endif
- if ( !attributeConversionOk || isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation +#if __GNUC__ >= 4
+ if ( !attributeConversionOk || __gnu_cxx::isnan( attributeValue ) ) //don't consider vertices with attributes like 'nan' for the interpolation +using std::isnan;
{ +#else
return 4; +using __gnu_cxx::isnan;
} +#endif
QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog ): QgsInterpolator( inputData ), mTriangulation( 0 ), \
mTriangleInterpolator( 0 ), mIsInitialized( false ), mShowProgressDialog( showProgressDialog ), mExportTriangulationToFile( false ), mInterpolation( interpolation )