From 79f8e1d21d057ada5974186eb35e84140702931c Mon Sep 17 00:00:00 2001 From: "Douglas E. Warner" Date: Mon, 18 Feb 2008 19:59:36 +0000 Subject: [PATCH] updated gcc43 duplicate param patch --- gcc43-duplicate_function_param-qgis-0.9.1.patch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gcc43-duplicate_function_param-qgis-0.9.1.patch b/gcc43-duplicate_function_param-qgis-0.9.1.patch index 8b31532..e0758a8 100644 --- a/gcc43-duplicate_function_param-qgis-0.9.1.patch +++ b/gcc43-duplicate_function_param-qgis-0.9.1.patch @@ -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