Use lock/unlock directly instead QMutexLocker to avoid compilation pr…

…oblems on Qt6
qgis · Nov 18, 2021 · 5bedbda · 5bedbda
1 parent 05e69bf
commit 5bedbda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/core/providers/ogr/qgsogrfeatureiterator.cpp b/src/core/providers/ogr/qgsogrfeatureiterator.cpp
@@ -55,7 +55,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
 
   if ( mSharedDS )
   {
-    mTransactionDSLocker.reset( new QMutexLocker( &mSharedDS->mutex() ) );
+    mSharedDS->mutex().lock();
   }
 
   /* When inside a transaction for GPKG/SQLite and fetching fid(s) we might be nested inside an outer fetching loop,
@@ -488,9 +488,9 @@ bool QgsOgrFeatureIterator::close()
   {
     iteratorClosed();
     mOgrLayer = nullptr;
-    mSharedDS.reset();
-
     mClosed = true;
+    mSharedDS->mutex().unlock();
+    mSharedDS.reset();
     return true;
   }
 

diff --git a/src/core/providers/ogr/qgsogrfeatureiterator.h b/src/core/providers/ogr/qgsogrfeatureiterator.h
@@ -27,8 +27,6 @@
 #include <set>
 #include "qgis_sip.h"
 
-#include <QMutexLocker>
-
 ///@cond PRIVATE
 #define SIP_NO_FILE
 
@@ -106,7 +104,6 @@ class QgsOgrFeatureIterator final: public QgsAbstractFeatureIteratorFromSource<Q
     QgsRectangle mFilterRect;
     QgsCoordinateTransform mTransform;
     QgsOgrDatasetSharedPtr mSharedDS = nullptr;
-    std::unique_ptr<QMutexLocker> mTransactionDSLocker = nullptr;
 
     bool mFirstFieldIsFid = false;
     QgsFields mFieldsWithoutFid;