Skip to content
Permalink
Browse files
fix warning
  • Loading branch information
jef-n committed Feb 7, 2013
1 parent cb7f7bf commit 7551aa71d29516a8763607c3bbac215ed569405c
Showing with 2 additions and 2 deletions.
  1. +1 −0 CMakeLists.txt
  2. +1 −2 src/core/qgsvectorlayerfeatureiterator.cpp
@@ -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)
@@ -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() )

0 comments on commit 7551aa7

Please sign in to comment.