Skip to content
Permalink
Browse files

Remove workaround for GDAL <2.2

  • Loading branch information
nyalldawson committed Apr 30, 2021
1 parent 58c3665 commit 4d24b6efe505d3f713ac05d03cfde93c47454fe3
Showing with 0 additions and 15 deletions.
  1. +0 −7 src/core/providers/ogr/qgsogrprovider.cpp
  2. +0 −8 src/core/qgsogrutils.cpp
@@ -86,13 +86,6 @@ email : sherman at mrcc.com
#include <sys/vfs.h>
#endif

// Starting with GDAL 2.2, there are 2 concepts: unset fields and null fields
// whereas previously there was only unset fields. For QGIS purposes, both
// states (unset/null) are equivalent.
#ifndef OGRNullMarker
#define OGR_F_IsFieldSetAndNotNull OGR_F_IsFieldSet
#endif

#define TEXT_PROVIDER_KEY QStringLiteral( "ogr" )
#define TEXT_PROVIDER_DESCRIPTION QStringLiteral( "OGR data provider" )

@@ -38,14 +38,6 @@

#include "ogr_srs_api.h"

// Starting with GDAL 2.2, there are 2 concepts: unset fields and null fields
// whereas previously there was only unset fields. For QGIS purposes, both
// states (unset/null) are equivalent.
#ifndef OGRNullMarker
#define OGR_F_IsFieldSetAndNotNull OGR_F_IsFieldSet
#endif



void gdal::OGRDataSourceDeleter::operator()( OGRDataSourceH source )
{

0 comments on commit 4d24b6e

Please sign in to comment.