[mapguide-commits] r4193 - in trunk/MgDev: Common/PlatformBase/Services Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: leaf
Date: 2009-08-27 05:36:18 -0400 (Thu, 27 Aug 2009)
New Revision: 4193

Modified:
   trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h
   trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
Log:
Ticket #1073: Rename constant from 'MgParameterDirection::Return' to 'MgParameterDirection::Ret' because 'Return' conflicts with PHP keyword and it will result in PHP parse error.

Modified: trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h	2009-08-26 22:17:42 UTC (rev 4192)
+++ trunk/MgDev/Common/PlatformBase/Services/ParameterDirection.h	2009-08-27 09:36:18 UTC (rev 4193)
@@ -52,7 +52,7 @@
     /// \brief
     /// Specifies that the parameter is a return parameter.
     ///
-    static const INT32 Return = 3;
+    static const INT32 Ret = 3;
 };
 /// \}
 

Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp	2009-08-26 22:17:42 UTC (rev 4192)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureUtil.cpp	2009-08-27 09:36:18 UTC (rev 4193)
@@ -2659,7 +2659,7 @@
             fdoParameterDirection = FdoParameterDirection_Output;
             break;
         }
-        case MgParameterDirection::Return:
+        case MgParameterDirection::Ret:
         {
             fdoParameterDirection = FdoParameterDirection_Return;
             break;
@@ -2704,7 +2704,7 @@
         }
         case FdoParameterDirection_Return:
         {
-            parameterDirection = MgParameterDirection::Return;
+            parameterDirection = MgParameterDirection::Ret;
             break;
         }
         default: