fix windows build

qgis · Jan 26, 2013 · 2800b4a · 2800b4a
1 parent 85b684c
commit 2800b4a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/core/qgsfeatureiterator.h b/src/core/qgsfeatureiterator.h
@@ -7,7 +7,7 @@
 /** \ingroup core
  * Internal feature iterator to be implemented within data providers
  */
-class QgsAbstractFeatureIterator
+class CORE_EXPORT QgsAbstractFeatureIterator
 {
   public:
     //! base class constructor - stores the iteration parameters
@@ -40,7 +40,7 @@ class QgsAbstractFeatureIterator
  * \ingroup core
  * Wrapper for iterator of features from vector data provider or vector layer
  */
-class QgsFeatureIterator
+class CORE_EXPORT QgsFeatureIterator
 {
   public:
     //! construct invalid iterator

diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h
@@ -38,7 +38,7 @@ typedef QList<int> QgsAttributeList;
  *     QgsFeatureRequest().setFilterFid(45)
  *
  */
-class QgsFeatureRequest
+class CORE_EXPORT QgsFeatureRequest
 {
   public:
     enum Flag

diff --git a/src/core/qgsvectorlayerfeatureiterator.h b/src/core/qgsvectorlayerfeatureiterator.h
@@ -8,9 +8,9 @@
 typedef QMap<QgsFeatureId, QgsFeature> QgsFeatureMap;
 
 class QgsVectorLayer;
-class QgsVectorJoinInfo;
+struct QgsVectorJoinInfo;
 
-class QgsVectorLayerFeatureIterator : public QgsAbstractFeatureIterator
+class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureIterator
 {
 public:
   QgsVectorLayerFeatureIterator( QgsVectorLayer* layer, const QgsFeatureRequest& request );

diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp
@@ -89,7 +89,7 @@ void TestQgsVectorDataProvider::cleanupTestCase()
 
 static double keep6digits( double x )
 {
-  return round( x*1e6 ) / 1e6;
+  return qRound( x*1e6 ) / 1e6;
 }
 
 static void checkFid4( QgsFeature& f, bool hasGeometry, bool hasAttrs, int onlyOneAttribute )