[mapguide-commits] r1176 - in trunk/MgDev/Server/src:
Gws/GwsQueryEngine Services/Feature Services/Mapping
Services/Rendering UnitTesting
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Mar 8 07:10:16 EST 2007
Author: waltweltonlair
Date: 2007-03-08 07:10:16 -0500 (Thu, 08 Mar 2007)
New Revision: 1176
Modified:
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBinaryFeatureWriter.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightBatchSortedBlockJoinQueryResults.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightNestedLoopJoinQueryResults.cpp
trunk/MgDev/Server/src/Services/Feature/FeatureServiceCache.cpp
trunk/MgDev/Server/src/Services/Feature/OpXmlToSchema.cpp
trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp
trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
Log:
Fix a few Linux build warnings.
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -333,11 +333,11 @@
// Set the 1st cache entry to read
m_pPrimaryCacheIterator = m_pPrimaryCache.begin();
- FdoPtr<FdoDataValueCollection> dvcol = NULL;
+ FdoPtr<FdoDataValueCollection> dvcol;
for ( size_t i=0;i<m_pPrimaryCache.size();i++ )
{
- FdoPtr<FdoDataValue> val = NULL;
+ FdoPtr<FdoDataValue> val;
PrimaryCacheEntry* cacheEntry = m_pPrimaryCache.at(i);
if(cacheEntry)
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBinaryFeatureWriter.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBinaryFeatureWriter.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBinaryFeatureWriter.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -211,13 +211,13 @@
// name: "AssocProp.Id". If that property value is found and set, then that means an association
// exists between the new object(we are about to insert) and the object identified by the value
// of the property value(AssocProp.Id)
- FdoPtr<FdoClassDefinition>cls = apd->GetAssociatedClass();
+ FdoPtr<FdoClassDefinition> cls = apd->GetAssociatedClass();
idents = cls->GetIdentityProperties();
}
for(int i=0; i<idents->GetCount(); i++ )
{
- FdoPtr<FdoDataPropertyDefinition>prop = idents->GetItem( i );
+ FdoPtr<FdoDataPropertyDefinition> prop = idents->GetItem( i );
std::wstring wstr = apd->GetName();
wstr += L".";
wstr += prop->GetName();
@@ -260,18 +260,18 @@
// name: "AssocProp.Id". If that property value is found and set, then that means an association
// exists between the new object(we are about to insert) and the object identified by the value
// of the property value(AssocProp.Id)
- FdoPtr<FdoClassDefinition>cls = apd->GetAssociatedClass();
+ FdoPtr<FdoClassDefinition> cls = apd->GetAssociatedClass();
idents = cls->GetIdentityProperties();
}
if( reader->IsNull( apd->GetName() ) )
return;
- FdoPtr<FdoIFeatureReader>loc_reader = reader->GetFeatureObject( apd->GetName() );
+ FdoPtr<FdoIFeatureReader> loc_reader = reader->GetFeatureObject( apd->GetName() );
if( ! loc_reader->ReadNext() )
return;
for(int i=0; i<idents->GetCount(); i++ )
{
- FdoPtr<FdoDataPropertyDefinition>prop = idents->GetItem( i );
+ FdoPtr<FdoDataPropertyDefinition> prop = idents->GetItem( i );
if( ! loc_reader->IsNull( prop->GetName() ) )
WriteProperty( prop, loc_reader);
}
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -599,7 +599,7 @@
EGwsStatus stat = eGwsOk;
- FdoPtr<FdoFilter> pFilter = NULL;
+ FdoPtr<FdoFilter> pFilter;
FdoInt32 idx;
for (idx = 0; idx < identity->GetCount(); idx ++) {
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsPreparedFeatureQuery.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -370,7 +370,7 @@
//Code for executing an extended query - if it's requested (bScrollable)
//AND if it's supported (m_bSdfExtendedQuerySupported)
bool bGotScrollableIterator = false;
- FdoPtr<FdoIFeatureReader> reader = NULL;
+ FdoPtr<FdoIFeatureReader> reader;
if(bScrollable && m_bExtendedQuerySupported)
{
if(mExSelProv == eSDF)
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightBatchSortedBlockJoinQueryResults.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightBatchSortedBlockJoinQueryResults.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightBatchSortedBlockJoinQueryResults.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -125,7 +125,7 @@
WSTR filter = propname;
filter += L" IN (";
- FdoPtr<FdoFilter> pFilter = NULL;
+ FdoPtr<FdoFilter> pFilter;
for (int idx = 0; idx < vals.GetCount (); idx ++)
{
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightNestedLoopJoinQueryResults.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightNestedLoopJoinQueryResults.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsRightNestedLoopJoinQueryResults.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -73,7 +73,7 @@
try {
Close ();
- FdoPtr<FdoFilter> pFilter = NULL;
+ FdoPtr<FdoFilter> pFilter;
for (int idx = 0; idx < m_joincols->GetCount (); idx ++) {
FdoString * propname = m_joincols->GetString (idx);
Modified: trunk/MgDev/Server/src/Services/Feature/FeatureServiceCache.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/FeatureServiceCache.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Services/Feature/FeatureServiceCache.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -628,8 +628,7 @@
INT32 size = collection->GetCount();
for(nIndex=0;nIndex<size;nIndex++)
{
- Ptr<MgFeatureServiceCacheEntry > cacheEntry;
- cacheEntry = (MgFeatureServiceCacheEntry *)(collection->GetItem(nIndex));
+ Ptr<MgFeatureServiceCacheEntry> cacheEntry = (MgFeatureServiceCacheEntry*)(collection->GetItem(nIndex));
if(cacheEntry)
{
ACE_Time_Value diffTime = now - cacheEntry->m_timeStamp;
@@ -660,8 +659,7 @@
INT32 size = collection->GetCount();
for(nIndex=0;nIndex<size;nIndex++)
{
- Ptr<MgFeatureServiceCacheEntry > cacheEntry;
- cacheEntry = (MgFeatureServiceCacheEntry *)(collection->GetItem(nIndex));
+ Ptr<MgFeatureServiceCacheEntry> cacheEntry = (MgFeatureServiceCacheEntry*)(collection->GetItem(nIndex));
if(cacheEntry)
{
if(cacheEntry->m_resource == resource->ToString())
Modified: trunk/MgDev/Server/src/Services/Feature/OpXmlToSchema.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/OpXmlToSchema.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Services/Feature/OpXmlToSchema.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -79,8 +79,7 @@
Validate();
// Execute the operation
- Ptr<MgFeatureSchemaCollection> schemaCol= m_service->XmlToSchema(xml);
-
+ Ptr<MgFeatureSchemaCollection> schemaCol = m_service->XmlToSchema(xml);
// Write the response
EndExecution(schemaCol);
Modified: trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Services/Feature/ServerGetSpatialContexts.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -157,7 +157,7 @@
FdoSpatialContextExtentType extentType = FdoSpatialContextExtentType_Dynamic;
// Extent (Geometry data)
- FdoPtr<FdoByteArray> byteArray = NULL;
+ FdoPtr<FdoByteArray> byteArray;
// XY Tolerance
double xyTol = 0;
Modified: trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Services/Mapping/StylizationUtil.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -331,7 +331,7 @@
//if we have a valid transform, get the request extent in layer's space
if (trans)
{
- Ptr<MgEnvelope> mapExt= new MgEnvelope(ll, ur);
+ Ptr<MgEnvelope> mapExt = new MgEnvelope(ll, ur);
//get corresponding bounds in layer space
Ptr<MgEnvelope> layerExt = trans->Transform(mapExt);
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -577,7 +577,7 @@
if (maxFeatures == -1)
maxFeatures = INT_MAX;
- Ptr<MgSelection> sel = NULL;//TODO: do we need this for this API? new MgSelection(map);
+ Ptr<MgSelection> sel; //TODO: do we need this for this API? new MgSelection(map);
FeaturePropRenderer fpr(sel, maxFeatures, map->GetViewScale());
RenderForSelection(map, layerNames, geometry, selectionVariant, maxFeatures, &fpr, bIgnoreScaleRange);
Modified: trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2007-03-08 02:08:55 UTC (rev 1175)
+++ trunk/MgDev/Server/src/UnitTesting/TestGeometry.cpp 2007-03-08 12:10:16 UTC (rev 1176)
@@ -1175,7 +1175,7 @@
outerCoords->Add(coord4);
outerCoords->Add(coord5);
Ptr<MgLinearRing> outerRing = factory.CreateLinearRing(outerCoords);
- Ptr<MgLinearRingCollection> innerRings = NULL;
+ Ptr<MgLinearRingCollection> innerRings;
polygon = factory.CreatePolygon(outerRing, innerRings);
geom = point->Intersection(polygon);
CPPUNIT_ASSERT(geom == NULL);
More information about the mapguide-commits
mailing list