rpms/qgis/devel gcc43-duplicate_function_param-qgis-0.9.1.patch, 1.1, 1.2
Douglas E. Warner (silfreed)
fedora-extras-commits at redhat.com
Mon Feb 18 19:59:41 UTC 2008
Author: silfreed
Update of /cvs/pkgs/rpms/qgis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7013
Modified Files:
gcc43-duplicate_function_param-qgis-0.9.1.patch
Log Message:
updated gcc43 duplicate param patch
gcc43-duplicate_function_param-qgis-0.9.1.patch:
Index: gcc43-duplicate_function_param-qgis-0.9.1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qgis/devel/gcc43-duplicate_function_param-qgis-0.9.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc43-duplicate_function_param-qgis-0.9.1.patch 18 Feb 2008 19:46:42 -0000 1.1
+++ gcc43-duplicate_function_param-qgis-0.9.1.patch 18 Feb 2008 19:59:36 -0000 1.2
@@ -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
More information about the fedora-extras-commits
mailing list