[mapguide-commits] r8415 - trunk/MgDev/Desktop/MgDesktop/Services/Rendering

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-10-18 02:54:52 -0700 (Sat, 18 Oct 2014)
New Revision: 8415

Modified:
   trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.cpp
   trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.h
Log:
mg-desktop: Fix build break as a result of 64-bit linux fixes.

Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.cpp
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.cpp	2014-10-17 13:27:46 UTC (rev 8414)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.cpp	2014-10-18 09:54:52 UTC (rev 8415)
@@ -184,7 +184,7 @@
 }
 
 
-unsigned char RSMgdFeatureReader::GetByte(const wchar_t* propertyName)
+FdoInt8 RSMgdFeatureReader::GetByte(const wchar_t* propertyName)
 {
     RSFR_TRY()
     return m_reader->GetByte(propertyName);
@@ -228,7 +228,7 @@
 }
 
 
-short RSMgdFeatureReader::GetInt16(const wchar_t* propertyName)
+FdoInt16 RSMgdFeatureReader::GetInt16(const wchar_t* propertyName)
 {
     RSFR_TRY()
     return m_reader->GetInt16(propertyName);
@@ -236,7 +236,7 @@
 }
 
 
-int RSMgdFeatureReader::GetInt32(const wchar_t* propertyName)
+FdoInt32 RSMgdFeatureReader::GetInt32(const wchar_t* propertyName)
 {
     RSFR_TRY()
     return m_reader->GetInt32(propertyName);
@@ -244,7 +244,7 @@
 }
 
 
-long long RSMgdFeatureReader::GetInt64(const wchar_t* propertyName)
+FdoInt64 RSMgdFeatureReader::GetInt64(const wchar_t* propertyName)
 {
     RSFR_TRY()
     return m_reader->GetInt64(propertyName);

Modified: trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.h
===================================================================
--- trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.h	2014-10-17 13:27:46 UTC (rev 8414)
+++ trunk/MgDev/Desktop/MgDesktop/Services/Rendering/RSMgFeatureReader.h	2014-10-18 09:54:52 UTC (rev 8415)
@@ -34,13 +34,13 @@
 
     virtual bool            IsNull         (const wchar_t* propertyName);
     virtual bool            GetBoolean     (const wchar_t* propertyName);
-    virtual unsigned char   GetByte        (const wchar_t* propertyName);
+    virtual FdoInt8         GetByte        (const wchar_t* propertyName);
     virtual FdoDateTime     GetDateTime    (const wchar_t* propertyName);
     virtual float           GetSingle      (const wchar_t* propertyName);
     virtual double          GetDouble      (const wchar_t* propertyName);
-    virtual short           GetInt16       (const wchar_t* propertyName);
-    virtual int             GetInt32       (const wchar_t* propertyName);
-    virtual long long       GetInt64       (const wchar_t* propertyName);
+    virtual FdoInt16        GetInt16       (const wchar_t* propertyName);
+    virtual FdoInt32        GetInt32       (const wchar_t* propertyName);
+    virtual FdoInt64        GetInt64       (const wchar_t* propertyName);
     virtual const wchar_t*  GetString      (const wchar_t* propertyName);
     virtual LineBuffer*     GetGeometry    (const wchar_t* propertyName, LineBuffer* lb, CSysTransformer* xformer);
     virtual RS_Raster*      GetRaster      (const wchar_t* propertyName);