<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<META NAME="Generator" CONTENT="MS Exchange Server version 6.0.6618.4">
<TITLE>svn commit: r1032 - Changes to allow compiling on Fedora Core 6, gcc 4.1.1 20061011 (Red Hat 4.1.1-30)</TITLE>
</HEAD>
<BODY>
<!-- Converted from text/rtf format -->
<P><FONT SIZE=2 FACE="Arial">NOTE: we are sending these commit emails to mapguide_dev@lists.osgeo.org until the mapguide_commits@lists.osgeo.org list comes back online.</FONT></P>
<P><FONT SIZE=2 FACE="Arial">Revision: 1032</FONT>
<BR><FONT SIZE=2 FACE="Arial">Author: tomfukushima</FONT>
<BR><FONT SIZE=2 FACE="Arial">Date: 5:05:21 PM, Thursday, January 04, 2007</FONT>
<BR><FONT SIZE=2 FACE="Arial">Message:</FONT>
<BR><FONT SIZE=2 FACE="Arial">Changes to allow compiling on Fedora Core 6, gcc 4.1.1 20061011 (Red Hat 4.1.1-30)</FONT>
<BR><FONT SIZE=2 FACE="Arial">----</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Common/MapGuideCommon/Services/PrintLayout.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Common/MdfParser/IOAttributeRelate.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Server/src/Gws/Include/GwsCommon.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">Modified : /trunk/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h</FONT>
</P>
<P><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Oem/gdal-1.3.0/frmts/fit/fitdataset.cpp (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -174,7 +174,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> public:</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- FITRasterBand::FITRasterBand( FITDataset *, int );</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ FITRasterBand( FITDataset *, int );</FONT>
<BR><FONT SIZE=2 FACE="Arial"> ~FITRasterBand();</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> // should override RasterIO eventually.</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Oem/SWIGEx/Source/Modules/java.cxx (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -3579,7 +3579,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> * director-based class.</FONT>
<BR><FONT SIZE=2 FACE="Arial"> * ----------------------------------------------------------------------------- */</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- virtual int JAVA::abstractClassTest(Node *n) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ virtual int abstractClassTest(Node *n) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> if (!Cmp(Getattr(n, "feature:director"), "1"))</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return 0;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return Language::abstractClassTest(n);</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -3608,3 +3608,4 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> -dllname <name> - set the name of JNI dll\n\</FONT>
<BR><FONT SIZE=2 FACE="Arial"> \n";</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">+</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Oem/geos-2.2.0/source/headers/geos/geom.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -358,52 +358,52 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> //double distance(Coordinate& p);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> static Coordinate nullCoord;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- void Coordinate::setNull() {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ void setNull() {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x=DoubleNotANumber;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y=DoubleNotANumber;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z=DoubleNotANumber;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- static Coordinate& Coordinate::getNull() {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static Coordinate& getNull() {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return nullCoord;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- Coordinate::Coordinate() {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ Coordinate() {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x=0.0;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y=0.0;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z=DoubleNotANumber;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- Coordinate::Coordinate(double xNew, double yNew, double zNew) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ Coordinate(double xNew, double yNew, double zNew) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x=xNew;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y=yNew;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z=zNew;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> #ifndef PROFILE_COORDINATE_COPIES</FONT>
<BR><FONT SIZE=2 FACE="Arial">- Coordinate::Coordinate(const Coordinate& c){</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ Coordinate(const Coordinate& c){</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x=c.x;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y=c.y;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z=c.z;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> #else</FONT>
<BR><FONT SIZE=2 FACE="Arial">- Coordinate::Coordinate(const Coordinate& c);</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ Coordinate(const Coordinate& c);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> Coordinate &operator=(const Coordinate &c);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> #endif</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- Coordinate::Coordinate(double xNew, double yNew){</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ Coordinate(double xNew, double yNew){</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x=xNew;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y=yNew;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z=DoubleNotANumber;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- void Coordinate::setCoordinate(const Coordinate& other) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ void setCoordinate(const Coordinate& other) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x = other.x;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y = other.y;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> z = other.z;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- bool Coordinate::equals2D(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ bool equals2D(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> if (x != other.x) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return false;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -413,7 +413,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return true;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- int Coordinate::compareTo(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ int compareTo(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> if (x < other.x) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return -1;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -429,22 +429,22 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return 0;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- bool Coordinate::equals3D(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ bool equals3D(const Coordinate& other) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- void Coordinate::makePrecise(const PrecisionModel *precisionModel) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ void makePrecise(const PrecisionModel *precisionModel) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> x = precisionModel->makePrecise(x);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> y = precisionModel->makePrecise(y);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- double Coordinate::distance(const Coordinate& p) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ double distance(const Coordinate& p) const {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> double dx = x - p.x;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> double dy = y - p.y;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return sqrt(dx * dx + dy * dy);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- int Coordinate::hashCode() {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ int hashCode() {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> //Algorithm from Effective Java by Joshua Bloch [Jon Aquino]</FONT>
<BR><FONT SIZE=2 FACE="Arial"> int result = 17;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> result = 37 * result + hashCode(x);</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -456,7 +456,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> * Returns a hash code for a double value, using the algorithm from</FONT>
<BR><FONT SIZE=2 FACE="Arial"> * Joshua Bloch's book <i>Effective Java</i></FONT>
<BR><FONT SIZE=2 FACE="Arial"> */</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static int Coordinate::hashCode(double x) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static int hashCode(double x) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> int64 f = (int64)(x);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> return (int)(f^(f>>32));</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Common/MdfParser/IOAttributeRelate.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -35,7 +35,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> Extension *m_pExtension;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> void WriteType(MdfStream &fd, AttributeRelate *pAttributeRelate);</FONT>
<BR><FONT SIZE=2 FACE="Arial">- AttributeRelate::RelateType IOAttributeRelate::ReadType(const wchar_t *name);</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ AttributeRelate::RelateType ReadType(const wchar_t *name);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> public:</FONT>
<BR><FONT SIZE=2 FACE="Arial"> IOAttributeRelate();</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Common/MapGuideCommon/Services/ServerConnectionImp.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -69,7 +69,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> /// \brief</FONT>
<BR><FONT SIZE=2 FACE="Arial"> /// Returns the ace handle</FONT>
<BR><FONT SIZE=2 FACE="Arial"> ///</FONT>
<BR><FONT SIZE=2 FACE="Arial">- ACE_HANDLE MgServerConnectionImp::GetHandle();</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ ACE_HANDLE GetHandle();</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> private:</FONT>
<BR><FONT SIZE=2 FACE="Arial"> ACE_SOCK_Stream* mServer;</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Common/MapGuideCommon/Services/PrintLayout.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -213,13 +213,13 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> INTERNAL_API:</FONT>
<BR><FONT SIZE=2 FACE="Arial"> /// Layout element constants</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::LegendWidth;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::LegendPadding;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::HeaderHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::ScalebarHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::ScalebarPadding;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::FooterHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">- static const double MgPrintLayout::GroupIndent;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double LegendWidth;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double LegendPadding;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double HeaderHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double ScalebarHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double ScalebarPadding;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double FooterHeight;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ static const double GroupIndent;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> //////////////////////////////////////////////////////////////////</FONT>
<BR><FONT SIZE=2 FACE="Arial"> /// \brief</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Server/src/Gws/Include/GwsCommon.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -828,7 +828,7 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> IGWSException(){}</FONT>
<BR><FONT SIZE=2 FACE="Arial"> virtual ~IGWSException() {}</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">- virtual void IGWSException::Dispose(){}</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ virtual void Dispose(){}</FONT>
<BR><FONT SIZE=2 FACE="Arial"> };</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryDefinition.cpp (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -231,13 +231,11 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">+template class GWSQueryDefinition<IGWSEqualJoinQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+template class GWSQueryDefinition<IGWSLeftJoinQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+template class GWSQueryDefinition<IGWSFeatureQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial">-template GWSQueryDefinition<IGWSEqualJoinQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial">-template GWSQueryDefinition<IGWSLeftJoinQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial">-template GWSQueryDefinition<IGWSFeatureQueryDefinition>;</FONT>
<BR><FONT SIZE=2 FACE="Arial">-</FONT>
<BR><FONT SIZE=2 FACE="Arial">-</FONT>
<BR><FONT SIZE=2 FACE="Arial"> bool</FONT>
<BR><FONT SIZE=2 FACE="Arial"> GwsQueryDefinitionXmlHelpers::CompareQueries(IGWSQueryDefinition* firstQuery</FONT>
<BR><FONT SIZE=2 FACE="Arial"> , IGWSQueryDefinition* secondQuery)</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Server/src/Gws/GwsQueryEngine/GwsFlatFdoReader.cpp (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -847,11 +847,11 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> template <class T></FONT>
<BR><FONT SIZE=2 FACE="Arial"> static void bpo(std::multimap<T,FdoInt32>& propmap, FdoOrderingOption order, std::vector<FdoInt32>& propertyOrder) {</FONT>
<BR><FONT SIZE=2 FACE="Arial"> if(FdoOrderingOption_Ascending==order) {</FONT>
<BR><FONT SIZE=2 FACE="Arial">- std::multimap<T,FdoInt32>::iterator mmIter;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ typename std::multimap<T,FdoInt32>::iterator mmIter;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> for(mmIter = propmap.begin(); mmIter!= propmap.end(); mmIter++)</FONT>
<BR><FONT SIZE=2 FACE="Arial"> propertyOrder.push_back(mmIter->second);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> } else {</FONT>
<BR><FONT SIZE=2 FACE="Arial">- std::multimap<T,FdoInt32>::reverse_iterator mmIter;</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ typename std::multimap<T,FdoInt32>::reverse_iterator mmIter;</FONT>
<BR><FONT SIZE=2 FACE="Arial"> for(mmIter = propmap.rbegin(); mmIter!= propmap.rend(); mmIter++)</FONT>
<BR><FONT SIZE=2 FACE="Arial"> propertyOrder.push_back(mmIter->second);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> }</FONT>
<BR><FONT SIZE=2 FACE="Arial">Index: D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h</FONT>
<BR><FONT SIZE=2 FACE="Arial">===================================================================</FONT>
<BR><FONT SIZE=2 FACE="Arial">--- D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h (revision 1031)</FONT>
<BR><FONT SIZE=2 FACE="Arial">+++ D:/svn/MgDev/Server/src/Services/Feature/ServerDescribeSchema.h (revision 1032)</FONT>
<BR><FONT SIZE=2 FACE="Arial">@@ -34,8 +34,8 @@</FONT>
<BR><FONT SIZE=2 FACE="Arial"> MgStringCollection* GetClasses(MgResourceIdentifier* resource, CREFSTRING schemaName);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> MgClassDefinition* GetClassDefinition(MgResourceIdentifier* resource, CREFSTRING schemaName, CREFSTRING className);</FONT></P>
<P><FONT SIZE=2 FACE="Arial"> STRING SchemaToXml(MgFeatureSchemaCollection* schema);</FONT>
<BR><FONT SIZE=2 FACE="Arial">- FdoFeatureSchemaCollection* MgServerDescribeSchema::GetFdoFeatureSchemaCollection(MgFeatureSchemaCollection* mgSchemaCol);</FONT></P>
<P><FONT SIZE=2 FACE="Arial">- FdoFeatureSchema* MgServerDescribeSchema::GetFdoFeatureSchema(MgFeatureSchema* mgSchema);</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ FdoFeatureSchemaCollection* GetFdoFeatureSchemaCollection(MgFeatureSchemaCollection* mgSchemaCol);</FONT>
<BR><FONT SIZE=2 FACE="Arial">+ FdoFeatureSchema* GetFdoFeatureSchema(MgFeatureSchema* mgSchema);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> void GetFdoClassCollection(FdoClassCollection* fdoClassCol, MgClassDefinitionCollection* mgClassDefCol);</FONT>
<BR><FONT SIZE=2 FACE="Arial"> </FONT>
<BR><FONT SIZE=2 FACE="Arial"> FdoClassDefinition* GetFdoClassDefinition(MgClassDefinition* mgClassDef, FdoClassCollection* fdoClassCol);</FONT>
</P>
</BODY>
</HTML>