fix warning

jef-n · jef-n · commit 7551aa71d295 · 2013-02-07T13:14:59.000+01:00
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/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() )

Original file line number	Diff line number	Diff line change
`@@ -341,8 +341,7 @@ void QgsVectorLayerFeatureIterator::addJoinedAttributes( QgsFeature &f )`
`341`	`341`	`for ( ; joinIt != mFetchJoinInfo.constEnd(); ++joinIt )`
`342`	`342`	`{`
`343`	`343`	`const FetchJoinInfo& info = joinIt.value();`
`344`		`- QgsVectorLayer* joinLayer = joinIt.key();`
`345`		`- Q_ASSERT( joinLayer );`
	`344`	`+ Q_ASSERT( joinIt.key() );`
`346`	`345`
`347`	`346`	`QVariant targetFieldValue = f.attribute( info.targetField );`
`348`	`347`	`if ( !targetFieldValue.isValid() )`