Skip to content
Permalink
Browse files
Fix build, warnings
  • Loading branch information
nyalldawson committed Jun 18, 2021
1 parent 11e88f7 commit bfed43fe2cc69206a25cdbda6991546c98b49ad7
Showing with 2 additions and 3 deletions.
  1. +1 −2 src/core/expression/qgsexpressionfunction.cpp
  2. +1 −1 src/core/qgsconnectionpool.h
@@ -6073,8 +6073,7 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
QgsFeatureRequest request;
request.setTimeout( 10000 );
request.setRequestMayBeNested( true );
if ( context )
request.setFeedback( context->feedback() );
request.setFeedback( context->feedback() );

// First parameter is the overlay layer
QgsExpressionNode *node = QgsExpressionUtils::getNode( values.at( 0 ), parent );
@@ -30,7 +30,7 @@
#include <QTime>
#include <QTimer>
#include <QThread>

#include <QElapsedTimer>

#define CONN_POOL_EXPIRATION_TIME 60 // in seconds
#define CONN_POOL_SPARE_CONNECTIONS 2 // number of spare connections in case all the base connections are used but we have a nested request with the risk of a deadlock

0 comments on commit bfed43f

Please sign in to comment.