35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
diff -ruN qgis-0.9.1/src/core/spatialindex/include/RTree.h qgis-0.9.1-new/src/core/spatialindex/include/RTree.h
|
|
--- qgis-0.9.1/src/core/spatialindex/include/RTree.h 2007-09-27 15:41:16.000000000 -0400
|
|
+++ qgis-0.9.1-new/src/core/spatialindex/include/RTree.h 2008-02-18 14:58:50.000000000 -0500
|
|
@@ -70,13 +70,7 @@
|
|
unsigned long m_dataLength;
|
|
}; // Data
|
|
|
|
-#ifdef _MSC_VER
|
|
- // MSVC didn't like the difference in parameter names between declaration
|
|
- // definition
|
|
extern ISpatialIndex* returnRTree(IStorageManager& sm, Tools::PropertySet& ps);
|
|
-#else
|
|
- extern ISpatialIndex* returnRTree(IStorageManager& in, Tools::PropertySet& in);
|
|
-#endif//_MSC_VER
|
|
extern ISpatialIndex* createNewRTree(
|
|
IStorageManager& sm,
|
|
double fillFactor,
|
|
diff -ruN qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h
|
|
--- qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h 2007-09-27 15:41:16.000000000 -0400
|
|
+++ qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h 2008-02-18 14:44:04.000000000 -0500
|
|
@@ -183,13 +183,7 @@
|
|
extern IStorageManager* createNewDiskStorageManager(std::string& baseName, unsigned long pageSize);
|
|
extern IStorageManager* loadDiskStorageManager(std::string& baseName);
|
|
|
|
-#ifdef _MSC_VER
|
|
- // MSVC didn't like the difference in parameter names between declaration
|
|
- // definition
|
|
extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& sm, Tools::PropertySet& ps);
|
|
-#else
|
|
- extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in, Tools::PropertySet& in);
|
|
-#endif//_MSC_VER
|
|
extern IBuffer* createNewRandomEvictionsBuffer(IStorageManager& in, unsigned int capacity, bool bWriteThrough);
|
|
}
|
|
|