Remove workaround for GDAL <2.2

qgis · Apr 30, 2021 · 4d24b6e · 4d24b6e
1 parent 58c3665
commit 4d24b6e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.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" )
 

diff --git a/src/core/qgsogrutils.cpp b/src/core/qgsogrutils.cpp
@@ -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 )
 {