dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

updated gcc43 duplicate param patch

Browse Source
This commit is contained in:
Douglas E. Warner 2008-02-18 19:59:36 +00:00
parent 16592da2b4
commit 79f8e1d21d
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc43-duplicate_function_param-qgis-0.9.1.patch
View File

@ -1,3 +1,20 @@
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