[mapguide-commits] r5378 - trunk/MgDev/Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: hubu
Date: 2010-11-09 00:42:49 -0800 (Tue, 09 Nov 2010)
New Revision: 5378

Modified:
   trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
Log:
Fix break build of GisPlatform on Linux.
1. UpdateDef should not return.
2. UpdateDef should be declared before it's invoked.

Modified: trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h
===================================================================
--- trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h	2010-11-08 18:22:17 UTC (rev 5377)
+++ trunk/MgDev/Common/CoordinateSystem/MentorDictionary.h	2010-11-09 08:42:49 UTC (rev 5378)
@@ -111,20 +111,6 @@
     //is the corresponding public API interface (MgCoordinateSystem
     //et al).
     //
-    template <class T, class Tinterface>
-    void UpdateDef(
-        CSystemNameDescriptionMap *pmapSystemNameDescription,
-        const char * (*key)(const T&),
-        const char * (*description)(const T&),
-        bool (Tinterface::*isValid)(),
-        T * (*CS_Tdef)(const char *),
-        int (*CS_Tupd)(T *, int),
-        bool (*BuildDefFromInterface)(Tinterface *, T&),
-        Tinterface *kpDef,
-        bool bAlreadyExists)
-    {
-        return UpdateDef(pmapSystemNameDescription, key, description, isValid, CS_Tdef, CS_Tupd, BuildDefFromInterface, kpDef, bAlreadyExists, true);
-    }
 
     template <class T, class Tinterface>
     void UpdateDef(
@@ -298,6 +284,20 @@
         }    //for each possible result of the update
     }
 
+    template <class T, class Tinterface>
+    void UpdateDef(
+        CSystemNameDescriptionMap *pmapSystemNameDescription,
+        const char * (*key)(const T&),
+        const char * (*description)(const T&),
+        bool (Tinterface::*isValid)(),
+        T * (*CS_Tdef)(const char *),
+        int (*CS_Tupd)(T *, int),
+        bool (*BuildDefFromInterface)(Tinterface *, T&),
+        Tinterface *kpDef,
+        bool bAlreadyExists)
+    {
+        UpdateDef<T, Tinterface>(pmapSystemNameDescription, key, description, isValid, CS_Tdef, CS_Tupd, BuildDefFromInterface, kpDef, bAlreadyExists, true);
+    }
 
     //Template function for removing a def from a dictionary.
     //Works for ellipsoids, datums, and coordinate systems.