[Mapguide_dev] svn commit: r1032 - Changes to allow compiling on Fedora Core 6, gcc 4.1.1 20061011 (Red Hat 4.1.1-30)

Tom Fukushima tom.fukushima at autodesk.com
Fri Jan 5 15:37:11 EST 2007


NOTE: we are sending these commit emails to mapguide_dev at lists.osgeo.org
until the mapguide_commits at lists.osgeo.org list comes back online.

Revision: 1032
Author: tomfukushima
Date: 5:05:21 PM, Thursday, January 04, 2007
Message:
Changes to allow compiling on Fedora Core 6, gcc 4.1.1 20061011 (Red Hat
4.1.1-30)
----
Modified : /trunk/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
Modified :
/trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
Modified : /trunk/MgDev/Common/MdfParser/IOAttributeRelate.h
Modified : /trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
Modified : /trunk/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
Modified : /trunk/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
Modified :
/trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
Modified :
/trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
Modified : /trunk/MgDev/Server/src/Gws/Include/GwsCommon.h
Modified :
/trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h

Index: D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
===================================================================
--- D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
(revision 1031)
+++ D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
(revision 1032)
@@ -174,7 +174,7 @@
 
 public:
 
-    FITRasterBand::FITRasterBand( FITDataset *, int );
+    FITRasterBand( FITDataset *, int );
 	~FITRasterBand();
     
     // should override RasterIO eventually.
Index: D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
===================================================================
--- D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx	(revision 1031)
+++ D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx	(revision 1032)
@@ -3579,7 +3579,7 @@
    * director-based class.
    *
------------------------------------------------------------------------
----- */
 
-  virtual int JAVA::abstractClassTest(Node *n) {
+  virtual int abstractClassTest(Node *n) {
     if (!Cmp(Getattr(n, "feature:director"), "1"))
       return 0;
     return Language::abstractClassTest(n);
@@ -3608,3 +3608,4 @@
      -dllname <name>    - set the name of JNI dll\n\
 \n";
 
+
Index: D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
===================================================================
--- D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
(revision 1031)
+++ D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
(revision 1032)
@@ -358,52 +358,52 @@
 	//double distance(Coordinate& p);
 	static Coordinate nullCoord;
 
-	void Coordinate::setNull() {
+	void setNull() {
 		x=DoubleNotANumber;
 		y=DoubleNotANumber;
 		z=DoubleNotANumber;
 	}
 
-	static Coordinate& Coordinate::getNull() {
+	static Coordinate& getNull() {
 		return nullCoord;
 	}
 
-	Coordinate::Coordinate() {
+	Coordinate() {
 		x=0.0;
 		y=0.0;
 		z=DoubleNotANumber;
 	}
 
-	Coordinate::Coordinate(double xNew, double yNew, double zNew) {
+	Coordinate(double xNew, double yNew, double zNew) {
 		x=xNew;
 		y=yNew;
 		z=zNew;
 	}
 
 #ifndef PROFILE_COORDINATE_COPIES
-	Coordinate::Coordinate(const Coordinate& c){
+	Coordinate(const Coordinate& c){
 		x=c.x;
 		y=c.y;
 		z=c.z;
 	}
 #else
-	Coordinate::Coordinate(const Coordinate& c);
+	Coordinate(const Coordinate& c);
 	Coordinate &operator=(const Coordinate &c);
 #endif
 
-	Coordinate::Coordinate(double xNew, double yNew){
+	Coordinate(double xNew, double yNew){
 		x=xNew;
 		y=yNew;
 		z=DoubleNotANumber;
 	}
 
-	void Coordinate::setCoordinate(const Coordinate& other) {
+	void setCoordinate(const Coordinate& other) {
 		x = other.x;
 		y = other.y;
 		z = other.z;
 	}
 
-	bool Coordinate::equals2D(const Coordinate& other) const {
+	bool equals2D(const Coordinate& other) const {
 		if (x != other.x) {
 		return false;
 		}
@@ -413,7 +413,7 @@
 		return true;
 	}
 
-	int Coordinate::compareTo(const Coordinate& other) const {
+	int compareTo(const Coordinate& other) const {
 		if (x < other.x) {
 		return -1;
 		}
@@ -429,22 +429,22 @@
 		return 0;
 	}
 
-	bool Coordinate::equals3D(const Coordinate& other) const {
+	bool equals3D(const Coordinate& other) const {
 		return (x == other.x) && ( y == other.y) && ((z ==
other.z)||(ISNAN(z) && ISNAN(other.z)));
 	}
 
-	void Coordinate::makePrecise(const PrecisionModel
*precisionModel) {
+	void makePrecise(const PrecisionModel *precisionModel) {
 		x = precisionModel->makePrecise(x);
 		y = precisionModel->makePrecise(y);
 	}
 
-	double Coordinate::distance(const Coordinate& p) const {
+	double distance(const Coordinate& p) const {
 		double dx = x - p.x;
 		double dy = y - p.y;
 		return sqrt(dx * dx + dy * dy);
 	}
 
-	int Coordinate::hashCode() {
+	int hashCode() {
 		//Algorithm from Effective Java by Joshua Bloch [Jon
Aquino]
 		int result = 17;
 		result = 37 * result + hashCode(x);
@@ -456,7 +456,7 @@
 	* Returns a hash code for a double value, using the algorithm
from
 	* Joshua Bloch's book <i>Effective Java</i>
 	*/
-	static int Coordinate::hashCode(double x) {
+	static int hashCode(double x) {
 		int64 f = (int64)(x);
 		return (int)(f^(f>>32));
 	}
Index: D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h
===================================================================
--- D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h	(revision 1031)
+++ D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h	(revision 1032)
@@ -35,7 +35,7 @@
         Extension *m_pExtension;
 
 		void WriteType(MdfStream &fd, AttributeRelate
*pAttributeRelate);
-		AttributeRelate::RelateType
IOAttributeRelate::ReadType(const wchar_t *name);
+		AttributeRelate::RelateType ReadType(const wchar_t
*name);
 
     public:
         IOAttributeRelate();
Index: D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
===================================================================
--- D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
(revision 1031)
+++ D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
(revision 1032)
@@ -69,7 +69,7 @@
     /// \brief
     /// Returns the ace handle
     ///
-    ACE_HANDLE MgServerConnectionImp::GetHandle();
+    ACE_HANDLE GetHandle();
 
 private:
     ACE_SOCK_Stream* mServer;
Index: D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
===================================================================
--- D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
(revision 1031)
+++ D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
(revision 1032)
@@ -213,13 +213,13 @@
 
 INTERNAL_API:
     /// Layout element constants
-    static const double MgPrintLayout::LegendWidth;
-    static const double MgPrintLayout::LegendPadding;
-    static const double MgPrintLayout::HeaderHeight;
-    static const double MgPrintLayout::ScalebarHeight;
-    static const double MgPrintLayout::ScalebarPadding;
-    static const double MgPrintLayout::FooterHeight;
-    static const double MgPrintLayout::GroupIndent;
+    static const double LegendWidth;
+    static const double LegendPadding;
+    static const double HeaderHeight;
+    static const double ScalebarHeight;
+    static const double ScalebarPadding;
+    static const double FooterHeight;
+    static const double GroupIndent;
 
     //////////////////////////////////////////////////////////////////
     /// \brief
Index: D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h	(revision 1031)
+++ D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h	(revision 1032)
@@ -828,7 +828,7 @@
     IGWSException(){}
     virtual ~IGWSException() {}
 
-    virtual void IGWSException::Dispose(){}
+    virtual void Dispose(){}
 };
 
 
Index: D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
===================================================================
--- D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
(revision 1031)
+++ D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp
(revision 1032)
@@ -231,13 +231,11 @@
 }
 
 
+template class GWSQueryDefinition<IGWSEqualJoinQueryDefinition>;
+template class GWSQueryDefinition<IGWSLeftJoinQueryDefinition>;
+template class GWSQueryDefinition<IGWSFeatureQueryDefinition>;
 
 
-template GWSQueryDefinition<IGWSEqualJoinQueryDefinition>;
-template GWSQueryDefinition<IGWSLeftJoinQueryDefinition>;
-template GWSQueryDefinition<IGWSFeatureQueryDefinition>;
-
-
 bool
 GwsQueryDefinitionXmlHelpers::CompareQueries(IGWSQueryDefinition*
firstQuery
                                          , IGWSQueryDefinition*
secondQuery)
Index: D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
===================================================================
--- D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
(revision 1031)
+++ D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp
(revision 1032)
@@ -847,11 +847,11 @@
 template <class T>
 static void bpo(std::multimap<T,FdoInt32>& propmap, FdoOrderingOption
order, std::vector<FdoInt32>& propertyOrder) {
     if(FdoOrderingOption_Ascending==order) {
-        std::multimap<T,FdoInt32>::iterator mmIter;
+        typename std::multimap<T,FdoInt32>::iterator mmIter;
         for(mmIter = propmap.begin(); mmIter!= propmap.end(); mmIter++)
             propertyOrder.push_back(mmIter->second);
     } else {
-        std::multimap<T,FdoInt32>::reverse_iterator mmIter;
+        typename std::multimap<T,FdoInt32>::reverse_iterator mmIter;
         for(mmIter = propmap.rbegin(); mmIter!= propmap.rend();
mmIter++)
             propertyOrder.push_back(mmIter->second);
     }
Index: D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h
===================================================================
--- D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h
(revision 1031)
+++ D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h
(revision 1032)
@@ -34,8 +34,8 @@
     MgStringCollection* GetClasses(MgResourceIdentifier* resource,
CREFSTRING schemaName);
     MgClassDefinition*  GetClassDefinition(MgResourceIdentifier*
resource, CREFSTRING schemaName, CREFSTRING className);
     STRING SchemaToXml(MgFeatureSchemaCollection* schema);
-    FdoFeatureSchemaCollection*
MgServerDescribeSchema::GetFdoFeatureSchemaCollection(MgFeatureSchemaCol
lection* mgSchemaCol);
-    FdoFeatureSchema*
MgServerDescribeSchema::GetFdoFeatureSchema(MgFeatureSchema* mgSchema);
+    FdoFeatureSchemaCollection*
GetFdoFeatureSchemaCollection(MgFeatureSchemaCollection* mgSchemaCol);
+    FdoFeatureSchema* GetFdoFeatureSchema(MgFeatureSchema* mgSchema);
     void GetFdoClassCollection(FdoClassCollection* fdoClassCol,
MgClassDefinitionCollection* mgClassDefCol);
 
     FdoClassDefinition* GetFdoClassDefinition(MgClassDefinition*
mgClassDef, FdoClassCollection* fdoClassCol);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/mapguide-internals/attachments/20070105/ba9a7757/attachment.html


More information about the Mapguide-internals mailing list