[mapguide-commits] r1042 - in branches/1.1.x/MgDev:
Common/MapGuideCommon/Services Common/MdfParser
Oem/SWIGEx/Source/Modules Oem/gdal-1.3.0/frmts/fit
Oem/geos-2.2.0/source/headers/geos Server/src/Gws/Include
Server/src/Services/Feature
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jan 12 16:06:24 EST 2007
Author: tomfukushima
Date: 2007-01-12 16:06:23 -0500 (Fri, 12 Jan 2007)
New Revision: 1042
Modified:
branches/1.1.x/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
branches/1.1.x/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
branches/1.1.x/MgDev/Common/MdfParser/IOAttributeRelate.h
branches/1.1.x/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
branches/1.1.x/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
branches/1.1.x/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
branches/1.1.x/MgDev/Server/src/Gws/Include/GwsCommon.h
branches/1.1.x/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h
Log:
Changes to allow compiling on Fedora Core 6, gcc 4.1.1 20061011 (Red Hat 4.1.1-30)
Modified: branches/1.1.x/MgDev/Common/MapGuideCommon/Services/PrintLayout.h
===================================================================
--- branches/1.1.x/MgDev/Common/MapGuideCommon/Services/PrintLayout.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Common/MapGuideCommon/Services/PrintLayout.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -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
Modified: branches/1.1.x/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h
===================================================================
--- branches/1.1.x/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -69,7 +69,7 @@
/// \brief
/// Returns the ace handle
///
- ACE_HANDLE MgServerConnectionImp::GetHandle();
+ ACE_HANDLE GetHandle();
private:
ACE_SOCK_Stream* mServer;
Modified: branches/1.1.x/MgDev/Common/MdfParser/IOAttributeRelate.h
===================================================================
--- branches/1.1.x/MgDev/Common/MdfParser/IOAttributeRelate.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Common/MdfParser/IOAttributeRelate.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -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();
Modified: branches/1.1.x/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
===================================================================
--- branches/1.1.x/MgDev/Oem/SWIGEx/Source/Modules/java.cxx 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Oem/SWIGEx/Source/Modules/java.cxx 2007-01-12 21:06:23 UTC (rev 1042)
@@ -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";
+
Modified: branches/1.1.x/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp
===================================================================
--- branches/1.1.x/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp 2007-01-12 21:06:23 UTC (rev 1042)
@@ -174,7 +174,7 @@
public:
- FITRasterBand::FITRasterBand( FITDataset *, int );
+ FITRasterBand( FITDataset *, int );
~FITRasterBand();
// should override RasterIO eventually.
Modified: branches/1.1.x/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h
===================================================================
--- branches/1.1.x/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -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));
}
Modified: branches/1.1.x/MgDev/Server/src/Gws/Include/GwsCommon.h
===================================================================
--- branches/1.1.x/MgDev/Server/src/Gws/Include/GwsCommon.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Server/src/Gws/Include/GwsCommon.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -804,7 +804,7 @@
IGWSException(){}
virtual ~IGWSException() {}
- virtual void IGWSException::Dispose(){}
+ virtual void Dispose(){}
};
Modified: branches/1.1.x/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h
===================================================================
--- branches/1.1.x/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h 2007-01-12 03:44:53 UTC (rev 1041)
+++ branches/1.1.x/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h 2007-01-12 21:06:23 UTC (rev 1042)
@@ -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(MgFeatureSchemaCollection* 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);
More information about the mapguide-commits
mailing list