Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Nov 15, 2017
1 parent 80ad163 commit ac574e2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
Expand Up @@ -16,7 +16,7 @@
#include "qgscrscache.h"
#include "qgsgeometryfollowboundariescheck.h"
#include "qgsgeometryengine.h"

#include "qgsspatialindex.h"

This comment has been minimized.

Copy link
@manisandro

manisandro Nov 15, 2017

Member

@nyalldawson Sorry about that (what can possibly go wrong by removing an include >.<)


QgsGeometryFollowBoundariesCheck::QgsGeometryFollowBoundariesCheck( QgsGeometryCheckerContext *context, QgsVectorLayer *checkLayer )
: QgsGeometryCheck( FeatureNodeCheck, {QgsWkbTypes::PolygonGeometry}, context )
Expand Down
4 changes: 4 additions & 0 deletions src/providers/ogr/qgsogrprovider.cpp
Expand Up @@ -3452,9 +3452,13 @@ void QgsOgrProviderUtils::GDALCloseWrapper( GDALDatasetH hDS )
if ( !bSuccess )
{
if ( openedAsUpdate )
{
QgsDebugMsg( "GPKG: Trying again" );
}
else
{
QgsDebugMsg( "GPKG: Trying to return to delete mode" );
}
CPLSetThreadLocalConfigOption( "OGR_SQLITE_JOURNAL", "DELETE" );
hDS = GDALOpenEx( datasetName.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_UPDATE, nullptr, nullptr, nullptr );
CPLSetThreadLocalConfigOption( "OGR_SQLITE_JOURNAL", nullptr );
Expand Down

1 comment on commit ac574e2

@m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented on ac574e2 Nov 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks 👍

Please sign in to comment.