[mapguide-commits] r8237 - in sandbox/jng/v30: . Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-06-17 06:16:34 -0700 (Tue, 17 Jun 2014)
New Revision: 8237

Modified:
   sandbox/jng/v30/
   sandbox/jng/v30/Common/CoordinateSystem/CoordSysCatalog.cpp
   sandbox/jng/v30/Common/CoordinateSystem/CoordSysFormatConverter.cpp
   sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h
Log:
Merged revision(s) 8229 from trunk/MgDev:
Fix CS-Map headers in light of (http://trac.osgeo.org/csmap/changeset/2463)
........



Property changes on: sandbox/jng/v30
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/sandbox/jng/createruntimemap:7486-7555
/sandbox/rfc94:5099-5163
/trunk/MgDev:8229

Modified: sandbox/jng/v30/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- sandbox/jng/v30/Common/CoordinateSystem/CoordSysCatalog.cpp	2014-06-17 10:16:51 UTC (rev 8236)
+++ sandbox/jng/v30/Common/CoordinateSystem/CoordSysCatalog.cpp	2014-06-17 13:16:34 UTC (rev 8237)
@@ -49,7 +49,7 @@
 #include "CoordSysCatalog.h"                //for CCoordinateSystemCatalog
 #include "CoordSysGeodeticTransformation.h" //for CCoordinateSystemGeodeticTransformation
 
-#include "csNameMapper.hpp"                 //for csReleaseNameMapper
+#include "cs_NameMapper.hpp"                 //for csReleaseNameMapper
 #include "cs_map.h"
 
 #ifdef _WIN32

Modified: sandbox/jng/v30/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/jng/v30/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2014-06-17 10:16:51 UTC (rev 8236)
+++ sandbox/jng/v30/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2014-06-17 13:16:34 UTC (rev 8237)
@@ -17,7 +17,7 @@
 
 #include "GeometryCommon.h"
 #include "CoordSysCommon.h"
-#include "csNameMapperSupport.h"
+#include "cs_NameMapperSupport.h"
 #include "CriticalSection.h"
 
 #include "CoordSysWktFailureCache.h"

Modified: sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h	2014-06-17 10:16:51 UTC (rev 8236)
+++ sandbox/jng/v30/Common/CoordinateSystem/CoordSysUtil.h	2014-06-17 13:16:34 UTC (rev 8237)
@@ -22,7 +22,7 @@
 #ifdef min
 #undef min
 #endif
-#include "rcWellKnownText.hpp"
+#include "CS_wktObject.hpp"
 #include "cs_wkt.h"
 #include "CsmapVersion.h"