Skip to content
Permalink
Browse files

Fix build, tests

  • Loading branch information
nyalldawson committed Oct 24, 2017
1 parent 7455c2f commit 63e6cda6f3191d513483ab054cf1995506d8ba13
Showing with 3 additions and 1 deletion.
  1. +2 −0 src/analysis/raster/qgskde.h
  2. +1 −1 src/core/qgsvectorfilewriter.cpp
@@ -101,7 +101,9 @@ class ANALYSIS_EXPORT QgsKernelDensityEstimation
*/
QgsKernelDensityEstimation( const Parameters &parameters, const QString &outputFile, const QString &outputFormat );

//! QgsKernelDensityEstimation cannot be copied.
QgsKernelDensityEstimation( const QgsKernelDensityEstimation &other ) = delete;
//! QgsKernelDensityEstimation cannot be copied.
QgsKernelDensityEstimation &operator=( const QgsKernelDensityEstimation &other ) = delete;

/**
@@ -2019,7 +2019,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur
// field to not be present at all in the output, and thus on reading to
// have disappeared. #16812
#ifdef OGRNullMarker
OGR_F_SetFieldNull( poFeature, ogrField );
OGR_F_SetFieldNull( poFeature.get(), ogrField );
#endif
continue;
}

0 comments on commit 63e6cda

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