fix GCC 4.3 compatibility issues (still compiles with GCC 4.2 and MSVC8)

git-svn-id: http://svn.osgeo.org/qgis/trunk@8257 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 21, 2008 · 106cb5c · 106cb5c
1 parent 2ce0bdc
commit 106cb5c
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 11 deletions.
diff --git a/src/app/composer/qgscomposition.cpp b/src/app/composer/qgscomposition.cpp
@@ -13,6 +13,8 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <typeinfo>
+
 #include "qgscomposition.h"
 
 #include "qgscomposer.h"

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -17,6 +17,7 @@
  ***************************************************************************/
  /* $Id$ */
 
+#include <memory>
 
 #include "qgsattributeactiondialog.h"
 #include "qgscontexthelp.h"

diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -17,6 +17,7 @@
 #include <QTextCodec>
 
 #include <cfloat> // for DBL_MAX
+#include <climits>
 
 #include "qgsvectordataprovider.h"
 #include "qgsfeature.h"

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -24,6 +24,7 @@
 #include <cassert>
 #include <cfloat>
 #include <cstring>
+#include <climits>
 #include <cmath>
 #include <iosfwd>
 #include <iostream>

diff --git a/src/core/raster/qgscontrastenhancement.h b/src/core/raster/qgscontrastenhancement.h
@@ -46,7 +46,7 @@ class CORE_EXPORT QgsContrastEnhancement {
    **
    ** 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,

diff --git a/src/core/spatialindex/geometry/LineSegment.cc b/src/core/spatialindex/geometry/LineSegment.cc
@@ -19,6 +19,8 @@
 //  Email:
 //    mhadji@gmail.com
 
+#include <cstring>
+#include <limits>
 #include <Tools.h>
 
 Tools::Geometry::LineSegment::LineSegment()

diff --git a/src/core/spatialindex/geometry/Point.cc b/src/core/spatialindex/geometry/Point.cc
@@ -19,6 +19,8 @@
 //  Email:
 //    mhadji@gmail.com
 
+#include <cstring>
+#include <limits>
 #include <Tools.h>
 
 Tools::Geometry::Point::Point()

diff --git a/src/core/spatialindex/geometry/Region.cc b/src/core/spatialindex/geometry/Region.cc
@@ -17,6 +17,8 @@
 //  Email:
 //    mhadji@gmail.com
 
+#include <cstring>
+#include <limits>
 #include <Tools.h>
 
 Tools::Geometry::Region::Region()

diff --git a/src/core/spatialindex/include/RTree.h b/src/core/spatialindex/include/RTree.h
@@ -75,7 +75,7 @@ namespace SpatialIndex
 		// 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,

diff --git a/src/core/spatialindex/include/SpatialIndex.h b/src/core/spatialindex/include/SpatialIndex.h
@@ -31,7 +31,7 @@
 #include <queue>
 #include <set>
 #include <cmath>
-#include <string>
+#include <cstring>
 #include <sstream>
 
 #include "Tools.h"
@@ -188,7 +188,7 @@ namespace SpatialIndex
 		// 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);
 	}

diff --git a/src/core/spatialindex/rtree/BulkLoader.cc b/src/core/spatialindex/rtree/BulkLoader.cc
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
+#include <cstring>
 
 #include "../spatialindex/SpatialIndexImpl.h"
 

diff --git a/src/core/spatialindex/rtree/Leaf.cc b/src/core/spatialindex/rtree/Leaf.cc
@@ -135,7 +135,7 @@ void Leaf::deleteData(long id, std::stack<long>& pathBuffer)
 		{
 			// 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;

diff --git a/src/core/spatialindex/rtree/Node.cc b/src/core/spatialindex/rtree/Node.cc
@@ -592,7 +592,7 @@ void Node::rtreeSplit(unsigned long dataLength, byte* pData, Region& mbr, long i
 
 	// 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.

diff --git a/src/core/spatialindex/rtree/RTree.cc b/src/core/spatialindex/rtree/RTree.cc
@@ -1097,7 +1097,7 @@ void SpatialIndex::RTree::RTree::insertData_impl(unsigned long dataLength, byte*
 		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())

diff --git a/src/core/spatialindex/storagemanager/Buffer.h b/src/core/spatialindex/storagemanager/Buffer.h
@@ -22,6 +22,8 @@
 #ifndef __storagemanager_buffer_h
 #define __storagemanager_buffer_h
 
+#include <cstring>
+
 namespace SpatialIndex
 {
 	namespace StorageManager

diff --git a/src/core/spatialindex/storagemanager/DiskStorageManager.cc b/src/core/spatialindex/storagemanager/DiskStorageManager.cc
@@ -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 @@ DiskStorageManager::DiskStorageManager(Tools::PropertySet& ps) : m_pageSize(0),
 
 	// create buffer.
 	m_buffer = new byte[m_pageSize];
-	bzero(m_buffer, m_pageSize);
+	memset(m_buffer, 0, m_pageSize);
 
 	if (bOverwrite == false)
 	{

diff --git a/src/core/spatialindex/storagemanager/MemoryStorageManager.h b/src/core/spatialindex/storagemanager/MemoryStorageManager.h
@@ -22,6 +22,8 @@
 #ifndef __storagemanager_memorystoragemanager_h
 #define __storagemanager_memorystoragemanager_h
 
+#include <cstring>
+
 namespace SpatialIndex
 {
 	namespace StorageManager

diff --git a/src/core/spatialindex/tools/Tools.cc b/src/core/spatialindex/tools/Tools.cc
@@ -19,6 +19,9 @@
 //  Email:
 //    mhadji@gmail.com
 
+#include <cstring>
+#include <limits>
+#include <cfloat>
 #include <Tools.h>
 #include "ExternalSort.h"
 //#include "SHA1.h"

diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp
@@ -13,6 +13,7 @@
  *                                                                       *
  *************************************************************************/
 #include <iostream>
+#include <typeinfo>
 
 #include <qapplication.h>
 #include <qstringlist.h>

diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp
@@ -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 @@ QgsGrassModule::QgsGrassModule ( QgsGrassTools *tools, QString moduleName, QgisI
   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 @@ void QgsGrassModule::run()
     * 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();
 

diff --git a/src/plugins/qgisplugin.h b/src/plugins/qgisplugin.h
@@ -61,7 +61,7 @@ class QgisPlugin
 
        @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 */

diff --git a/src/providers/gpx/gpsdata.cpp b/src/providers/gpx/gpsdata.cpp
@@ -17,6 +17,7 @@
 
 #include <limits>
 #include <stdexcept>
+#include <cstring>
 
 #include <QFile>
 #include <QTextStream>

diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp
@@ -21,6 +21,7 @@
 #include <algorithm>
 #include <iostream>
 #include <limits>
+#include <cstring>
 #include <cmath>
 
 // Changed #include <qapp.h> to <qapplication.h>. Apparently some

diff --git a/src/providers/postgres/qgspostgisbox2d.cpp b/src/providers/postgres/qgspostgisbox2d.cpp
@@ -18,6 +18,7 @@
 /* $Id$ */
 
 #include <fstream>
+#include <cstdlib>
 
 #include <QString>
 

diff --git a/src/providers/postgres/qgspostgisbox3d.cpp b/src/providers/postgres/qgspostgisbox3d.cpp
@@ -18,6 +18,7 @@
 /* $Id$ */
 
 #include <fstream>
+#include <cstdlib>
 
 #include <QString>