Showing with 5 additions and 5 deletions.

+1 −0 CMakeLists.txt

+1 −1 src/core/qgspallabeling.cpp

+0 −1 src/core/qgsvectorlayer.cpp

+1 −2 src/core/qgsvectorlayerfeatureiterator.cpp

+2 −1 src/providers/postgres/qgspostgresfeatureiterator.cpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -299,6 +299,7 @@ IF (PEDANTIC)
     # disable warnings
     ADD_DEFINITIONS( /wd4100 )  # unused formal parameters
     ADD_DEFINITIONS( /wd4127 )  # constant conditional expressions (used in Qt template classes)
+    ADD_DEFINITIONS( /wd4505 )  # unreferenced local function has been removed (QgsRasterDataProvider::extent)
     ADD_DEFINITIONS( /wd4510 )  # default constructor could not be generated (sqlite3_index_info, QMap)
     ADD_DEFINITIONS( /wd4512 )  # assignment operator could not be generated (sqlite3_index_info)
     ADD_DEFINITIONS( /wd4610 )  # user defined constructor required (sqlite3_index_info)

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1165,7 +1165,7 @@ bool QgsPalLabeling::willUseLayer( QgsVectorLayer* layer )
 
 int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx )
 {
-  QgsDebugMsg( "PREPARE LAYER" );
+  QgsDebugMsg( "PREPARE LAYER " + layer->id() );
   Q_ASSERT( mMapRenderer != NULL );
 
   // start with a temporary settings class, find out labeling info

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1057,7 +1057,6 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
     bool labeling = false;
     prepareLabelingAndDiagrams( rendererContext, attributes, labeling );
 
-
     try
     {
       QgsFeatureIterator fit = getFeatures( QgsFeatureRequest()

diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -341,8 +341,7 @@ void QgsVectorLayerFeatureIterator::addJoinedAttributes( QgsFeature &f )
   for ( ; joinIt != mFetchJoinInfo.constEnd(); ++joinIt )
   {
     const FetchJoinInfo& info = joinIt.value();
-    QgsVectorLayer* joinLayer = joinIt.key();
-    Q_ASSERT( joinLayer );
+    Q_ASSERT( joinIt.key() );
 
     QVariant targetFieldValue = f.attribute( info.targetField );
     if ( !targetFieldValue.isValid() )

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -50,7 +50,6 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
   // make sure that only one iterator is active
   if ( P->mActiveIterator )
     P->mActiveIterator->close();
-  P->mActiveIterator = this;
 
   mCursorName = QString( "qgisf%1" ).arg( P->mProviderId );
 
@@ -79,6 +78,8 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
     return;
   }
 
+  P->mActiveIterator = this;
+
   mFetched = 0;
 }