[QGIS Commit] r8257 - in trunk/qgis/src: app app/composer core
core/raster core/spatialindex/geometry
core/spatialindex/include core/spatialindex/rtree
core/spatialindex/storagemanager core/spatialindex/tools
plugins plugins/grass providers/gpx providers/postgres
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Mar 20 20:45:50 EDT 2008
Author: jef
Date: 2008-03-20 20:45:50 -0400 (Thu, 20 Mar 2008)
New Revision: 8257
Modified:
trunk/qgis/src/app/composer/qgscomposition.cpp
trunk/qgis/src/app/qgsvectorlayerproperties.cpp
trunk/qgis/src/core/qgsvectordataprovider.cpp
trunk/qgis/src/core/qgsvectorlayer.cpp
trunk/qgis/src/core/raster/qgscontrastenhancement.h
trunk/qgis/src/core/spatialindex/geometry/LineSegment.cc
trunk/qgis/src/core/spatialindex/geometry/Point.cc
trunk/qgis/src/core/spatialindex/geometry/Region.cc
trunk/qgis/src/core/spatialindex/include/RTree.h
trunk/qgis/src/core/spatialindex/include/SpatialIndex.h
trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc
trunk/qgis/src/core/spatialindex/rtree/Leaf.cc
trunk/qgis/src/core/spatialindex/rtree/Node.cc
trunk/qgis/src/core/spatialindex/rtree/RTree.cc
trunk/qgis/src/core/spatialindex/storagemanager/Buffer.h
trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc
trunk/qgis/src/core/spatialindex/storagemanager/MemoryStorageManager.h
trunk/qgis/src/core/spatialindex/tools/Tools.cc
trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
trunk/qgis/src/plugins/qgisplugin.h
trunk/qgis/src/providers/gpx/gpsdata.cpp
trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
trunk/qgis/src/providers/postgres/qgspostgisbox2d.cpp
trunk/qgis/src/providers/postgres/qgspostgisbox3d.cpp
Log:
fix GCC 4.3 compatibility issues (still compiles with GCC 4.2 and MSVC8)
Modified: trunk/qgis/src/app/composer/qgscomposition.cpp
===================================================================
--- trunk/qgis/src/app/composer/qgscomposition.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/app/composer/qgscomposition.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -13,6 +13,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
+#include <typeinfo>
+
#include "qgscomposition.h"
#include "qgscomposer.h"
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -17,6 +17,7 @@
***************************************************************************/
/* $Id$ */
+#include <memory>
#include "qgsattributeactiondialog.h"
#include "qgscontexthelp.h"
Modified: trunk/qgis/src/core/qgsvectordataprovider.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectordataprovider.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/qgsvectordataprovider.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -17,6 +17,7 @@
#include <QTextCodec>
#include <cfloat> // for DBL_MAX
+#include <climits>
#include "qgsvectordataprovider.h"
#include "qgsfeature.h"
Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -24,6 +24,7 @@
#include <cassert>
#include <cfloat>
#include <cstring>
+#include <climits>
#include <cmath>
#include <iosfwd>
#include <iostream>
Modified: trunk/qgis/src/core/raster/qgscontrastenhancement.h
===================================================================
--- trunk/qgis/src/core/raster/qgscontrastenhancement.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/raster/qgscontrastenhancement.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -46,7 +46,7 @@
**
** It seems like there should be a better way to do this...
*/
- typedef enum QgsRasterDataType {
+ enum QgsRasterDataType {
QGS_Unknown = 0,
/*! Eight bit unsigned integer */ QGS_Byte = 1,
/*! Sixteen bit unsigned integer */ QGS_UInt16 = 2,
Modified: trunk/qgis/src/core/spatialindex/geometry/LineSegment.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/geometry/LineSegment.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/geometry/LineSegment.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -19,6 +19,8 @@
// Email:
// mhadji at gmail.com
+#include <cstring>
+#include <limits>
#include <Tools.h>
Tools::Geometry::LineSegment::LineSegment()
Modified: trunk/qgis/src/core/spatialindex/geometry/Point.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/geometry/Point.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/geometry/Point.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -19,6 +19,8 @@
// Email:
// mhadji at gmail.com
+#include <cstring>
+#include <limits>
#include <Tools.h>
Tools::Geometry::Point::Point()
Modified: trunk/qgis/src/core/spatialindex/geometry/Region.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/geometry/Region.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/geometry/Region.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -17,6 +17,8 @@
// Email:
// mhadji at gmail.com
+#include <cstring>
+#include <limits>
#include <Tools.h>
Tools::Geometry::Region::Region()
Modified: trunk/qgis/src/core/spatialindex/include/RTree.h
===================================================================
--- trunk/qgis/src/core/spatialindex/include/RTree.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/include/RTree.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -75,7 +75,7 @@
// definition
extern ISpatialIndex* returnRTree(IStorageManager& sm, Tools::PropertySet& ps);
#else
- extern ISpatialIndex* returnRTree(IStorageManager& in, Tools::PropertySet& in);
+ extern ISpatialIndex* returnRTree(IStorageManager& in0, Tools::PropertySet& in1);
#endif//_MSC_VER
extern ISpatialIndex* createNewRTree(
IStorageManager& sm,
Modified: trunk/qgis/src/core/spatialindex/include/SpatialIndex.h
===================================================================
--- trunk/qgis/src/core/spatialindex/include/SpatialIndex.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/include/SpatialIndex.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -31,7 +31,7 @@
#include <queue>
#include <set>
#include <cmath>
-#include <string>
+#include <cstring>
#include <sstream>
#include "Tools.h"
@@ -188,7 +188,7 @@
// definition
extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& sm, Tools::PropertySet& ps);
#else
- extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in, Tools::PropertySet& in);
+ extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in0, Tools::PropertySet& in1);
#endif//_MSC_VER
extern IBuffer* createNewRandomEvictionsBuffer(IStorageManager& in, unsigned int capacity, bool bWriteThrough);
}
Modified: trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/rtree/BulkLoader.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -21,6 +21,7 @@
#include <stdio.h>
#include <unistd.h>
+#include <cstring>
#include "../spatialindex/SpatialIndexImpl.h"
Modified: trunk/qgis/src/core/spatialindex/rtree/Leaf.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/rtree/Leaf.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/rtree/Leaf.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -135,7 +135,7 @@
{
// keep this in the for loop. The tree height might change after insertions.
byte* overflowTable = new byte[m_pTree->m_stats.m_treeHeight];
- bzero(overflowTable, m_pTree->m_stats.m_treeHeight);
+ memset(overflowTable, 0, m_pTree->m_stats.m_treeHeight);
m_pTree->insertData_impl(n->m_pDataLength[cChild], n->m_pData[cChild], *(n->m_ptrMBR[cChild]), n->m_pIdentifier[cChild], n->m_level, overflowTable);
n->m_pData[cChild] = 0;
delete[] overflowTable;
Modified: trunk/qgis/src/core/spatialindex/rtree/Node.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/rtree/Node.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/rtree/Node.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -592,7 +592,7 @@
// use this mask array for marking visited entries.
byte* mask = new byte[m_capacity + 1];
- bzero(mask, m_capacity + 1);
+ memset(mask, 0, m_capacity + 1);
// insert new data in the node for easier manipulation. Data arrays are always
// by one larger than node capacity.
Modified: trunk/qgis/src/core/spatialindex/rtree/RTree.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/rtree/RTree.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/rtree/RTree.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -1097,7 +1097,7 @@
NodePtr root = readNode(m_rootID);
overflowTable = new byte[root->m_level];
- bzero(overflowTable, root->m_level);
+ memset(overflowTable, 0, root->m_level);
NodePtr l = root->chooseSubtree(mbr, 0, pathBuffer);
if (l.get() == root.get())
Modified: trunk/qgis/src/core/spatialindex/storagemanager/Buffer.h
===================================================================
--- trunk/qgis/src/core/spatialindex/storagemanager/Buffer.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/storagemanager/Buffer.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -22,6 +22,8 @@
#ifndef __storagemanager_buffer_h
#define __storagemanager_buffer_h
+#include <cstring>
+
namespace SpatialIndex
{
namespace StorageManager
Modified: trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/storagemanager/DiskStorageManager.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -26,6 +26,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
+#include <cstring>
#ifdef WIN32
#include <io.h>
@@ -194,7 +195,7 @@
// create buffer.
m_buffer = new byte[m_pageSize];
- bzero(m_buffer, m_pageSize);
+ memset(m_buffer, 0, m_pageSize);
if (bOverwrite == false)
{
Modified: trunk/qgis/src/core/spatialindex/storagemanager/MemoryStorageManager.h
===================================================================
--- trunk/qgis/src/core/spatialindex/storagemanager/MemoryStorageManager.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/storagemanager/MemoryStorageManager.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -22,6 +22,8 @@
#ifndef __storagemanager_memorystoragemanager_h
#define __storagemanager_memorystoragemanager_h
+#include <cstring>
+
namespace SpatialIndex
{
namespace StorageManager
Modified: trunk/qgis/src/core/spatialindex/tools/Tools.cc
===================================================================
--- trunk/qgis/src/core/spatialindex/tools/Tools.cc 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/core/spatialindex/tools/Tools.cc 2008-03-21 00:45:50 UTC (rev 8257)
@@ -19,6 +19,9 @@
// Email:
// mhadji at gmail.com
+#include <cstring>
+#include <limits>
+#include <cfloat>
#include <Tools.h>
#include "ExternalSort.h"
//#include "SHA1.h"
Modified: trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -13,6 +13,7 @@
* *
*************************************************************************/
#include <iostream>
+#include <typeinfo>
#include <qapplication.h>
#include <qstringlist.h>
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -76,6 +76,8 @@
#include "qgsfield.h"
#include "qgsfeature.h"
+#include <typeinfo>
+
extern "C" {
#include <grass/gis.h>
#include <grass/Vect.h>
@@ -303,7 +305,7 @@
connect ( &mProcess, SIGNAL(readyReadStandardError()), this, SLOT(readStderr()));
connect ( &mProcess, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus)));
- char *env = "GRASS_MESSAGE_FORMAT=gui";
+ const char *env = "GRASS_MESSAGE_FORMAT=gui";
char *envstr = new char[strlen(env)+1];
strcpy ( envstr, env );
putenv( envstr );
@@ -1237,7 +1239,7 @@
* G_GISRC_MODE_MEMORY mode, the variable remains set in variable when a module is run
* -> unset GISRC_MODE_MEMORY. Remove later once 6.1.x / 6.0.1 is widespread.
*/
- putenv ( "GISRC_MODE_MEMORY" ); // unset
+ putenv ( (char*) "GISRC_MODE_MEMORY" ); // unset
mOutputTextBrowser->clear();
Modified: trunk/qgis/src/plugins/qgisplugin.h
===================================================================
--- trunk/qgis/src/plugins/qgisplugin.h 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/plugins/qgisplugin.h 2008-03-21 00:45:50 UTC (rev 8257)
@@ -61,7 +61,7 @@
@todo XXX this may be a hint that there should be subclasses
*/
- typedef enum PLUGINTYPE
+ enum PLUGINTYPE
{
UI = 1, /* user interface plug-in */
MAPLAYER, /* map layer plug-in */
Modified: trunk/qgis/src/providers/gpx/gpsdata.cpp
===================================================================
--- trunk/qgis/src/providers/gpx/gpsdata.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/providers/gpx/gpsdata.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -17,6 +17,7 @@
#include <limits>
#include <stdexcept>
+#include <cstring>
#include <QFile>
#include <QTextStream>
Modified: trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
===================================================================
--- trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -21,6 +21,7 @@
#include <algorithm>
#include <iostream>
#include <limits>
+#include <cstring>
#include <cmath>
// Changed #include <qapp.h> to <qapplication.h>. Apparently some
Modified: trunk/qgis/src/providers/postgres/qgspostgisbox2d.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgisbox2d.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/providers/postgres/qgspostgisbox2d.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -18,6 +18,7 @@
/* $Id$ */
#include <fstream>
+#include <cstdlib>
#include <QString>
Modified: trunk/qgis/src/providers/postgres/qgspostgisbox3d.cpp
===================================================================
--- trunk/qgis/src/providers/postgres/qgspostgisbox3d.cpp 2008-03-20 21:39:51 UTC (rev 8256)
+++ trunk/qgis/src/providers/postgres/qgspostgisbox3d.cpp 2008-03-21 00:45:50 UTC (rev 8257)
@@ -18,6 +18,7 @@
/* $Id$ */
#include <fstream>
+#include <cstdlib>
#include <QString>
More information about the QGIS-commit
mailing list