[mapguide-commits] r8351 - in sandbox/jng/dwftk: . Common/CoordinateSystem

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-09-17 04:44:23 -0700 (Wed, 17 Sep 2014)
New Revision: 8351

Modified:
   sandbox/jng/dwftk/
   sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysFormatConverter.cpp
   sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysUtil.h
Log:
Merged revision(s) 8350 from trunk/MgDev:
Fix build break caused by CsMap update.
........



Property changes on: sandbox/jng/dwftk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8326
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8326,8350

Modified: sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2014-09-12 08:57:41 UTC (rev 8350)
+++ sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysFormatConverter.cpp	2014-09-17 11:44:23 UTC (rev 8351)
@@ -17,7 +17,6 @@
 
 #include "GeometryCommon.h"
 #include "CoordSysCommon.h"
-#include "cs_NameMapperSupport.h"
 #include "CriticalSection.h"
 
 #include "CoordSysWktFailureCache.h"

Modified: sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysUtil.h
===================================================================
--- sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysUtil.h	2014-09-12 08:57:41 UTC (rev 8350)
+++ sandbox/jng/dwftk/Common/CoordinateSystem/CoordSysUtil.h	2014-09-17 11:44:23 UTC (rev 8351)
@@ -22,6 +22,8 @@
 #ifdef min
 #undef min
 #endif
+#include "cs_map.h"
+#include "cs_NameMapper.hpp"
 #include "cs_WktObject.hpp"
 #include "cs_wkt.h"
 #include "CsmapVersion.h"