0001-Fix-build-failure-with-gcc-4.4-bug-10762.patch

landry Landry Breuil, 2014-08-18 06:53 AM

Download (9.67 KB)

View differences:

src/core/qgsvectorlayerfeatureiterator.cpp
86 86 

  		




  87
  87
  
    

  		




  88
  88
  
    
QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  89
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  89
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsVectorLayerFeatureSource>( source, ownSource, request )

  		




  90
  90
  
    
    , mEditGeometrySimplifier( 0 )

  		




  91
  91
  
    
{

  		




  92
  92
  
    

  		












  

    
      src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
    
  





  26
  26
  
    
#include <QTextStream>

  		




  27
  27
  
    

  		




  28
  28
  
    
QgsDelimitedTextFeatureIterator::QgsDelimitedTextFeatureIterator( QgsDelimitedTextFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  29
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  29
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsDelimitedTextFeatureSource>( source, ownSource, request )

  		




  30
  30
  
    
{

  		




  31
  31
  
    

  		




  32
  32
  
    
  // Determine mode to use based on request...

  		












  

    
      src/providers/gpx/qgsgpxfeatureiterator.cpp
    
  





  26
  26
  
    

  		




  27
  27
  
    

  		




  28
  28
  
    
QgsGPXFeatureIterator::QgsGPXFeatureIterator( QgsGPXFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  29
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  29
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsGPXFeatureSource>( source, ownSource, request )

  		




  30
  30
  
    
{

  		




  31
  31
  
    
  rewind();

  		




  32
  32
  
    
}

  		












  

    
      src/providers/grass/qgsgrassfeatureiterator.cpp
    
  





  67
  67
  
    

  		




  68
  68
  
    

  		




  69
  69
  
    
QgsGrassFeatureIterator::QgsGrassFeatureIterator( QgsGrassFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  70
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  70
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsGrassFeatureSource>( source, ownSource, request )

  		




  71
  71
  
    
{

  		




  72
  72
  
    
  sMutex.lock();

  		




  73
  73
  
    

  		












  

    
      src/providers/memory/qgsmemoryfeatureiterator.cpp
    
  





  23
  23
  
    

  		




  24
  24
  
    

  		




  25
  25
  
    
QgsMemoryFeatureIterator::QgsMemoryFeatureIterator( QgsMemoryFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  26
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  26
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsMemoryFeatureSource>( source, ownSource, request )

  		




  27
  27
  
    
    , mSelectRectGeom( 0 )

  		




  28
  28
  
    
{

  		




  29
  29
  
    

  		












  

    
      src/providers/mssql/qgsmssqlfeatureiterator.cpp
    
  





  25
  25
  
    

  		




  26
  26
  
    

  		




  27
  27
  
    
QgsMssqlFeatureIterator::QgsMssqlFeatureIterator( QgsMssqlFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  28
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  28
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsMssqlFeatureSource>( source, ownSource, request )

  		




  29
  29
  
    
{

  		




  30
  30
  
    
  mClosed = false;

  		




  31
  31
  
    
  mQuery = NULL;

  		












  

    
      src/providers/ogr/qgsogrfeatureiterator.cpp
    
  





  34
  34
  
    

  		




  35
  35
  
    

  		




  36
  36
  
    
QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  37
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  37
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsOgrFeatureSource>( source, ownSource, request )

  		




  38
  38
  
    
    , ogrDataSource( 0 )

  		




  39
  39
  
    
    , ogrLayer( 0 )

  		




  40
  40
  
    
    , mSubsetStringSet( false )

  		












  

    
      src/providers/oracle/qgsoraclefeatureiterator.cpp
    
  





  23
  23
  
    
#include <QObject>

  		




  24
  24
  
    

  		




  25
  25
  
    
QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* source, bool ownSource, const QgsFeatureRequest &request )

  		




  26
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  26
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsOracleFeatureSource>( source, ownSource, request )

  		




  27
  27
  
    
    , mRewind( false )

  		




  28
  28
  
    
{

  		




  29
  29
  
    
  mConnection = QgsOracleConn::connectDb( mSource->mUri.connectionInfo() );

  		












  

    
      src/providers/postgres/qgspostgresconnpool.h
    
  





  42
  42
  
    
    Q_OBJECT

  		




  43
  43
  
    

  		




  44
  44
  
    
  public:

  		




  45
  
  
    
    QgsPostgresConnPoolGroup( QString name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); }

  		




  
  45
  
    
    QgsPostgresConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsPostgresConn*>( name ) { initTimer( this ); }

  		




  46
  46
  
    

  		




  47
  47
  
    
  protected slots:

  		




  48
  48
  
    
    void handleConnectionExpired() { onConnectionExpired(); }

  		












  

    
      src/providers/postgres/qgspostgresfeatureiterator.cpp
    
  





  27
  27
  
    

  		




  28
  28
  
    

  		




  29
  29
  
    
QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  30
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  30
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsPostgresFeatureSource>( source, ownSource, request )

  		




  31
  31
  
    
    , mFeatureQueueSize( sFeatureQueueSize )

  		




  32
  32
  
    
{

  		




  33
  33
  
    
  mConn = QgsPostgresConnPool::instance()->acquireConnection( mSource->mConnInfo );

  		












  

    
      src/providers/spatialite/qgsspatialiteconnpool.h
    
  





  41
  41
  
    
    Q_OBJECT

  		




  42
  42
  
    

  		




  43
  43
  
    
  public:

  		




  44
  
  
    
    QgsSpatiaLiteConnPoolGroup( QString name ) : QgsConnectionPoolGroup( name ) { initTimer( this ); }

  		




  
  44
  
    
    QgsSpatiaLiteConnPoolGroup( QString name ) : QgsConnectionPoolGroup<QgsSqliteHandle*>( name ) { initTimer( this ); }

  		




  45
  45
  
    

  		




  46
  46
  
    
  protected slots:

  		




  47
  47
  
    
    void handleConnectionExpired() { onConnectionExpired(); }

  		












  

    
      src/providers/spatialite/qgsspatialitefeatureiterator.cpp
    
  





  24
  24
  
    

  		




  25
  25
  
    

  		




  26
  26
  
    
QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  27
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  27
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsSpatiaLiteFeatureSource>( source, ownSource, request )

  		




  28
  28
  
    
    , sqliteStatement( NULL )

  		




  29
  29
  
    
{

  		




  30
  30
  
    

  		












  

    
      src/providers/wfs/qgswfsfeatureiterator.cpp
    
  





  19
  19
  
    
#include "qgsgeometry.h"

  		




  20
  20
  
    

  		




  21
  21
  
    
QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSFeatureSource* source, bool ownSource, const QgsFeatureRequest& request )

  		




  22
  
  
    
    : QgsAbstractFeatureIteratorFromSource( source, ownSource, request )

  		




  
  22
  
    
    : QgsAbstractFeatureIteratorFromSource<QgsWFSFeatureSource>( source, ownSource, request )

  		




  23
  23
  
    
{

  		




  24
  24
  
    
  switch ( request.filterType() )

  		




  25
  25
  
    
  {

  		




  26
  
  
    
-