Skip to content

Commit 2800b4a

Browse files
committed
fix windows build
1 parent 85b684c commit 2800b4a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/core/qgsfeatureiterator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/** \ingroup core
88
* Internal feature iterator to be implemented within data providers
99
*/
10-
class QgsAbstractFeatureIterator
10+
class CORE_EXPORT QgsAbstractFeatureIterator
1111
{
1212
public:
1313
//! base class constructor - stores the iteration parameters
@@ -40,7 +40,7 @@ class QgsAbstractFeatureIterator
4040
* \ingroup core
4141
* Wrapper for iterator of features from vector data provider or vector layer
4242
*/
43-
class QgsFeatureIterator
43+
class CORE_EXPORT QgsFeatureIterator
4444
{
4545
public:
4646
//! construct invalid iterator

src/core/qgsfeaturerequest.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef QList<int> QgsAttributeList;
3838
* QgsFeatureRequest().setFilterFid(45)
3939
*
4040
*/
41-
class QgsFeatureRequest
41+
class CORE_EXPORT QgsFeatureRequest
4242
{
4343
public:
4444
enum Flag

src/core/qgsvectorlayerfeatureiterator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
typedef QMap<QgsFeatureId, QgsFeature> QgsFeatureMap;
99

1010
class QgsVectorLayer;
11-
class QgsVectorJoinInfo;
11+
struct QgsVectorJoinInfo;
1212

13-
class QgsVectorLayerFeatureIterator : public QgsAbstractFeatureIterator
13+
class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureIterator
1414
{
1515
public:
1616
QgsVectorLayerFeatureIterator( QgsVectorLayer* layer, const QgsFeatureRequest& request );

tests/src/core/testqgsvectordataprovider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void TestQgsVectorDataProvider::cleanupTestCase()
8989

9090
static double keep6digits( double x )
9191
{
92-
return round( x*1e6 ) / 1e6;
92+
return qRound( x*1e6 ) / 1e6;
9393
}
9494

9595
static void checkFid4( QgsFeature& f, bool hasGeometry, bool hasAttrs, int onlyOneAttribute )

0 commit comments

Comments
 (0)