[mapguide-commits] r6295 - in sandbox/adsk/vik/Common:
CoordinateSystem Foundation Foundation/Exception
Foundation/System Geometry Geometry/CoordinateSystem
Geometry/Exception Geometry/Parse Geometry/Spatial
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Dec 5 16:46:03 EST 2011
Author: traianstanev
Date: 2011-12-05 13:46:03 -0800 (Mon, 05 Dec 2011)
New Revision: 6295
Removed:
sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.h
Modified:
sandbox/adsk/vik/Common/CoordinateSystem/ArbitraryCoordsys.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumDatum.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumEllipsoid.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGridGeneric.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsZone.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysOneGrid.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp
sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.h
sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp
sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp
sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.cpp
sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.h
sandbox/adsk/vik/Common/Foundation/Exception/SystemException.cpp
sandbox/adsk/vik/Common/Foundation/Foundation.h
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.cpp
sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.h
sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp
sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.h
sandbox/adsk/vik/Common/Foundation/System/Mutex.h
sandbox/adsk/vik/Common/Foundation/System/StreamHelper.cpp
sandbox/adsk/vik/Common/Foundation/System/StreamHelper.h
sandbox/adsk/vik/Common/Foundation/System/Util.cpp
sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp
sandbox/adsk/vik/Common/Geometry/AgfStream.cpp
sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp
sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp
sandbox/adsk/vik/Common/Geometry/Coordinate.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateCollection.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.h
sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp
sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp
sandbox/adsk/vik/Common/Geometry/Curve.cpp
sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveRing.cpp
sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp
sandbox/adsk/vik/Common/Geometry/CurveString.cpp
sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp
sandbox/adsk/vik/Common/Geometry/Envelope.cpp
sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.cpp
sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.h
sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
sandbox/adsk/vik/Common/Geometry/Geometry.cpp
sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters
sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp
sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp
sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp
sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp
sandbox/adsk/vik/Common/Geometry/GeosUtil.cpp
sandbox/adsk/vik/Common/Geometry/LineString.cpp
sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp
sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp
sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp
sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp
sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp
sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp
sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp
sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp
sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp
sandbox/adsk/vik/Common/Geometry/Point.cpp
sandbox/adsk/vik/Common/Geometry/PointCollection.cpp
sandbox/adsk/vik/Common/Geometry/Polygon.cpp
sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp
sandbox/adsk/vik/Common/Geometry/Region.cpp
sandbox/adsk/vik/Common/Geometry/Ring.cpp
sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp
sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp
sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp
sandbox/adsk/vik/Common/Geometry/stdafx.h
Log:
Removed some unused classes from the project file. Unified the two mutex classes. Cleaned up header inclusions (the precompiled header now includes many things that don't have to be explicitly listed in the source files).
Modified: sandbox/adsk/vik/Common/CoordinateSystem/ArbitraryCoordsys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/ArbitraryCoordsys.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/ArbitraryCoordsys.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "ArbitraryCoordsys.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSys.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,10 +16,7 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
-#include "CriticalSection.h"
#include "CoordSys.h" //for CCoordinateSystem
#include "CoordSysMeasure.h" //for CCoordinateSystemMeasure
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCatalog.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "CoordSysCategory.h" //for CCategoryName
@@ -90,7 +87,8 @@
cs_Protect = 0;
// Initialize the critical section class
- CriticalClass.Initialize();
+ //MgMutex does this in its constructor automatically
+ //CriticalClass.Initialize();
try
{
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysCategory.h" //for CCoordinateSystemCategory
#include "CoordSysEnumCoordinateSystemInCategory.h" //for CCoordinateSystemEnumCoordinateSystemInCategory
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysCategoryDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysCategory.h" //for CCoordinateSystemCategory
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatum.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,10 +18,6 @@
#include "stdafx.h"
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysDatum.h" //for CCoordinateSystemDatum
#include "CoordSysGeodeticTransformation.h" //for CCoordinateSystemGeodeticTransformation
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDatumDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysDatum.h" //for CCoordinateSystemDatum
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSys.h" //for CCoordinateSystem
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysDictionaryUtility.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "CoordSysDictionaryUtility.h" //for CCoordinateSystemDictionaryUtility
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoid.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,9 +18,6 @@
#include "stdafx.h"
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
#include "MentorUtil.h" //for IsLegalMentorName
#include "CoordSysEllipsoid.h" //for CCoordinateSystemEllipsoid
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEllipsoidDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysEllipsoid.h" //for CCoordinateSystemEllipsoid
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnum.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
#include "CoordSysUtil.h" //for Convert_Ascii_To_Wide
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCategory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysEnumCategory.h" //for CCoordinateSystemEnumCategory
#include "CoordSysUtil.h" //for Convert_Ascii_To_Wide
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumCoordinateSystemInCategory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysEnumCoordinateSystemInCategory.h" //for CCoordinateSystemEnumCoordinateSystemInCategory
#include "CoordSysUtil.h" //for Convert_Ascii_To_Wide
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumDatum.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumDatum.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumDatum.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
#include "CoordSysEnumDatum.h" //for CCoordinateSystemEnumDatum
#include "CoordSysUtil.h" //for CsDictionaryOpenMode
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumEllipsoid.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumEllipsoid.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumEllipsoid.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysEnum.h" //for CCoordinateSystemEnum
#include "CoordSysEnumEllipsoid.h" //for CCoordinateSystemEnumEllipsoid
#include "CoordSysUtil.h" //for CsDictionaryOpenMode
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysEnumInteger32.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysEnumInteger32.h" //for CCoordinateSystemEnumInteger32
#include "CoordSysUtil.h" //for CsDictionaryOpenMode
#include "MentorUtil.h" //for IsLegalMentorName()
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysFormatConverter.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "csNameMapperSupport.h"
-#include "CriticalSection.h"
#include "CoordSysWktFailureCache.h"
#include "CoordSysFormatConverter.h" //for CCoordinateSystemFormatConverter
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticAnalyticalTransformDefParams.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -21,9 +21,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysGeodeticTransformDefParams.h"
#include "CoordSysGeodeticAnalyticalTransformDefParams.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticInterpolationTransformDefParams.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -21,9 +21,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysUtil.h"
#include "MentorUtil.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticMultipleRegressionTransformDefParams.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -21,9 +21,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysUtil.h"
#include "MentorUtil.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPath.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysGeodeticPathElement.h"
#include "CoordSysGeodeticPath.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -19,10 +19,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
#include "MentorUtil.h" //for OpenDictionaryFile()
#include "MentorDictionary.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticPathElement.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysGeodeticPathElement.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticStandaloneTransformDefParams.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -19,9 +19,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysGeodeticTransformDefParams.h"
#include "CoordSysGeodeticStandaloneTransformDefParams.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDef.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysGeodeticTransformation.h"
#include "CoordSysGeodeticTransformDefParams.h"
#include "CoordSysGeodeticStandaloneTransformDefParams.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -19,10 +19,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
#include "MentorUtil.h" //for OpenDictionaryFile()
#include "MentorDictionary.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformDefParams.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "CoordSysGeodeticTransformDefParams.h"
#include <cs_map.h>
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformGridFile.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -21,10 +21,6 @@
#include "CoordSysMacro.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
#include "MentorUtil.h" //for OpenDictionaryFile()
#include "MentorDictionary.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGeodeticTransformation.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "MentorUtil.h" //for BuildDtDefFromInterface + various utilities
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGridGeneric.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGridGeneric.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGridGeneric.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
-#include "CriticalSection.h" //for SmartCriticalClass
#include "CoordSysGrids.h"
#include "CoordSysOneGrid.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysGrids.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h"
-#include "CriticalSection.h"
#include "Spatial/MathUtility.h"
#include "Spatial/SpatialUtility.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMathComparator.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysMathComparator.h" //for CCoordinateSystemMathComparator
#include "CoordSysUtil.h" //for FloatEqual
#include "MentorUtil.h" //for IsLegalMentorName
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMeasure.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSys.h" //for CCoordinateSystem
#include "CoordSysMeasure.h" //for CCoordinateSystemMeasure
#include "CoordSysUtil.h" //for CsDictionaryOpenMode
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrs.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
-#include "CriticalSection.h" //for SmartCriticalClass
#include "CoordSysGrids.h"
#include "CoordSysOneGrid.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsMajorRegion.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,10 +16,8 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h"
-#include "CriticalSection.h"
+#include "System/Mutex.h"
#include "CoordSys.h"
#include "CoordSysGrids.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsZone.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsZone.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysMgrsZone.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii
-#include "CriticalSection.h" //for SmartCriticalClass
#include "Spatial/MathUtility.h"
#include "Spatial/SpatialUtility.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysOneGrid.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysOneGrid.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysOneGrid.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,7 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysUtil.h"
-#include "CriticalSection.h"
#include "CoordSys.h"
#include "CoordSysMathComparator.h"
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysProjectionInformation.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,9 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysEnumInteger32.h" //for CCoordinateSystemEnumInteger32
#include "CoordSysProjectionInformation.h" //for CCoordinateSystemProjectionInformation
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysTransform.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysTransform.h" //for CCoordinateSystemTransform
#include "CoordSysUtil.h" //for CsDictionaryOpenMode
#include "MentorUtil.h" //for IsLegalMentorName
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUnitInformation.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,9 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysEnumInteger32.h" //for CCoordinateSystemEnumInteger32
#include "CoordSysUnitInformation.h" //for CCoordinateSystemUnitInformation
#include "CoordSysUtil.h" //for Convert_Ascii_To_Wide
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,10 +18,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include <limits.h> //for INT_MAX
#include <assert.h>
#include <math.h> //for fabs()
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
#include "CoordSysWktFailureCache.h"
using namespace CSLibrary;
@@ -63,7 +61,7 @@
///
void CCoordinateSystemWktFailureCache::Clear()
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
for (CWktExceptionMap::iterator i = m_wktExceptionMap.begin();
i != m_wktExceptionMap.end(); ++i)
@@ -99,7 +97,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
SAFE_RELEASE(m_wktExceptionMap[key]);
m_wktExceptionMap[key] = SAFE_ADDREF(mgException);
@@ -129,7 +127,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
CWktExceptionMap::iterator mapItr = m_wktExceptionMap.find (key);
hasKey = (mapItr != m_wktExceptionMap.end ());
@@ -159,7 +157,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
return SAFE_ADDREF(m_wktExceptionMap[key]);
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CoordSysWktFailureCache.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -53,7 +53,7 @@
static CCoordinateSystemWktFailureCache sm_wktFailureCache;
- CustomThreadMutex m_mutex;
+ MgMutex m_mutex;
CWktExceptionMap m_wktExceptionMap;
};
Deleted: sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -1,102 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "stdafx.h"
-
-#ifdef _WIN32
-# include <Windows.h>
-#else
-# include <pthread.h>
-# ifndef __bsdi__
-# include <semaphore.h>
-# endif
-#endif
-
-#include "CriticalSection.h"
-
-#ifdef _WIN32
- CRITICAL_SECTION CritSect;
-#else //LINUX
- pthread_mutex_t CritSect;
- pthread_mutexattr_t CritSectAttributes;
-#endif
-
-//declare the "global" instance of our CustomCriticalSection object we're using throughout the whole process
-CustomCriticalSection CriticalClass;
-
-CustomCriticalSection::CustomCriticalSection()
-{
- m_bInitialized = false;
- Initialize();
-}
-
-#ifdef _WIN32
-
-CustomCriticalSection::~CustomCriticalSection()
-{
- ::DeleteCriticalSection(&CritSect);
-}
-
-void CustomCriticalSection::Initialize()
-{
- if(!m_bInitialized)
- {
- m_bInitialized = true;
- ::InitializeCriticalSection(&CritSect);
- }
-}
-
-void CustomCriticalSection::Enter()
-{
- ::EnterCriticalSection(&CritSect);
-}
-
-void CustomCriticalSection::Leave()
-{
- ::LeaveCriticalSection(&CritSect);
-}
-
-#else //LINUX
-
-CustomCriticalSection::~CustomCriticalSection()
-{
- pthread_mutex_destroy(&CritSect);
-}
-
-void CustomCriticalSection::Initialize()
-{
- if(!m_bInitialized)
- {
- m_bInitialized = true;
- pthread_mutexattr_init(&CritSectAttributes);
- pthread_mutexattr_settype(&CritSectAttributes, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&CritSect, &CritSectAttributes);
- pthread_mutexattr_destroy(&CritSectAttributes);
- }
-}
-
-void CustomCriticalSection::Enter()
-{
- pthread_mutex_lock(&CritSect);
-}
-
-void CustomCriticalSection::Leave()
-{
- pthread_mutex_unlock(&CritSect);
-}
-
-#endif //_WIN32
Deleted: sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/CriticalSection.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -1,41 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef CRITICALSECTION_H_
-#define CRITICALSECTION_H_
-
-#include "SmartCriticalClass.h"
-
-class CustomCriticalSection
-{
-public:
- CustomCriticalSection();
- ~CustomCriticalSection();
-
- void Initialize();
-
- void Enter();
- void Leave();
-
-private:
- bool m_bInitialized;
-};
-
-//This is used to protect *all* library calls - make sure, all comilation units refer to the same instance
-extern CustomCriticalSection CriticalClass;
-
-#endif //CRITICALSECTION_H_
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorDictionary.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,10 +17,6 @@
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
-
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "MentorDictionary.h"
#include "MentorUtil.h" //for OpenDictionaryFile()
Modified: sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/MentorUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -23,9 +23,6 @@
#include "stdafx.h"
#include <assert.h>
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-#include "CriticalSection.h"
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "MentorDictionary.h"
#ifdef _WIN32
Modified: sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.cpp
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,8 +17,10 @@
#include "stdafx.h"
-#include "CriticalSection.h"
+#include "System/Mutex.h"
+MgMutex CriticalClass;
+
//utility implementation to access the central "CriticalClass critical section"
//
SmartCriticalClass::SmartCriticalClass(bool bEnter)
@@ -26,7 +28,7 @@
{
if (bEnter)
{
- CriticalClass.Enter();
+ CriticalClass.Lock();
}
}
@@ -34,12 +36,12 @@
{
if (m_bEntered)
{
- CriticalClass.Leave();
+ CriticalClass.Unlock();
}
}
void SmartCriticalClass::Enter()
{
m_bEntered = true;
- CriticalClass.Enter();
+ CriticalClass.Lock();
}
Modified: sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.h
===================================================================
--- sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/CoordinateSystem/SmartCriticalClass.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,6 +18,10 @@
#ifndef SMARTCRITICALCLASS_H_
#define SMARTCRITICALCLASS_H_
+#include "System/Mutex.h"
+
+extern MgMutex CriticalClass;
+
class SmartCriticalClass
{
public:
Modified: sandbox/adsk/vik/Common/Foundation/Exception/SystemException.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Exception/SystemException.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/Exception/SystemException.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -90,7 +90,7 @@
// An equivalent MgException* is returned.
// If typeid cannot determine the specific standard library exception type
// a new MgUnclassifiedException is returned.
-
+#if WANT_ACE
if (typeid(stdLibException) == typeid(std::domain_error))
{
return new MgDomainException(methodName, lineNumber, fileName, NULL, messageId, &arguments);
@@ -139,4 +139,7 @@
{
return new MgUnclassifiedException(methodName, lineNumber, fileName, NULL, messageId, &arguments);
}
+#else
+ return new MgRuntimeException(methodName, lineNumber, fileName, NULL, messageId, &arguments);
+#endif
}
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -76,6 +76,10 @@
#include "ace/Process_Manager.h"
#include "ace/Date_Time.h"
+#include "System/ServerConnectionBase.h"
+#include "System/ByteSourceImpl.h"
+#include "Data/ByteSource.h"
+#include "Data/ByteSink.h"
#else //WANT_ACE
#include <assert.h>
@@ -97,11 +101,7 @@
#include "System/NamedSerializable.h"
#include "Data/Byte.h"
#include "Data/MimeType.h"
-#include "System/ServerConnectionBase.h"
#include "Data/ByteReader.h"
-#include "System/ByteSourceImpl.h"
-#include "Data/ByteSource.h"
-#include "Data/ByteSink.h"
#include "System/PacketStructure.h"
#include "System/StreamData.h"
@@ -192,6 +192,7 @@
#include "Exception/UnderflowException.h"
#include "Exception/XmlException.h"
#include "Exception/XmlParserException.h"
+#include "System/Mutex.h"
#include "System/ByteSourceFileImpl.h"
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj 2011-12-05 21:46:03 UTC (rev 6295)
@@ -197,18 +197,10 @@
<ClCompile Include="Exception\ApplicationException.cpp" />
<ClCompile Include="Exception\ArgumentOutOfRangeException.cpp" />
<ClCompile Include="Exception\ClassNotFoundException.cpp" />
- <ClCompile Include="Exception\ConfigurationException.cpp" />
- <ClCompile Include="Exception\ConfigurationLoadFailedException.cpp" />
- <ClCompile Include="Exception\ConfigurationSaveFailedException.cpp" />
- <ClCompile Include="Exception\DateTimeException.cpp" />
- <ClCompile Include="Exception\DecryptionException.cpp" />
<ClCompile Include="Exception\DirectoryNotFoundException.cpp" />
- <ClCompile Include="Exception\DivideByZeroException.cpp" />
- <ClCompile Include="Exception\DomainException.cpp" />
<ClCompile Include="Exception\DuplicateDirectoryException.cpp" />
<ClCompile Include="Exception\DuplicateFileException.cpp" />
<ClCompile Include="Exception\DuplicateObjectException.cpp" />
- <ClCompile Include="Exception\EncryptionException.cpp" />
<ClCompile Include="Exception\Exception.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@@ -224,13 +216,9 @@
<ClCompile Include="Exception\GridDensityException.cpp" />
<ClCompile Include="Exception\IndexOutOfRangeException.cpp" />
<ClCompile Include="Exception\InvalidArgumentException.cpp" />
- <ClCompile Include="Exception\InvalidCastException.cpp" />
- <ClCompile Include="Exception\InvalidMimeTypeException.cpp" />
<ClCompile Include="Exception\InvalidOperationException.cpp" />
<ClCompile Include="Exception\InvalidPropertyTypeException.cpp" />
- <ClCompile Include="Exception\InvalidStreamHeaderException.cpp" />
<ClCompile Include="Exception\IoException.cpp" />
- <ClCompile Include="Exception\LengthException.cpp" />
<ClCompile Include="Exception\LogicException.cpp" />
<ClCompile Include="Exception\NotFiniteNumberException.cpp" />
<ClCompile Include="Exception\NotImplementedException.cpp" />
@@ -241,10 +229,8 @@
<ClCompile Include="Exception\OutOfMemoryException.cpp" />
<ClCompile Include="Exception\OutOfRangeException.cpp" />
<ClCompile Include="Exception\OverflowException.cpp" />
- <ClCompile Include="Exception\PlatformNotSupportedException.cpp" />
<ClCompile Include="Exception\ResourcesException.cpp" />
<ClCompile Include="Exception\ResourcesLoadFailedException.cpp" />
- <ClCompile Include="Exception\ResourceTagNotFoundException.cpp" />
<ClCompile Include="Exception\RuntimeException.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
@@ -255,18 +241,11 @@
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
<XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
</ClCompile>
- <ClCompile Include="Exception\StreamIoException.cpp" />
<ClCompile Include="Exception\SystemException.cpp" />
<ClCompile Include="Exception\TemporaryFileNotAvailableException.cpp" />
- <ClCompile Include="Exception\ThirdPartyException.cpp" />
<ClCompile Include="Exception\UnclassifiedException.cpp" />
- <ClCompile Include="Exception\UnderflowException.cpp" />
- <ClCompile Include="Exception\XmlException.cpp" />
- <ClCompile Include="Exception\XmlParserException.cpp" />
<ClCompile Include="Data\BatchPropertyCollection.cpp" />
<ClCompile Include="Data\Byte.cpp" />
- <ClCompile Include="Data\ByteReader.cpp" />
- <ClCompile Include="Data\ByteSink.cpp" />
<ClCompile Include="Data\ByteSource.cpp" />
<ClCompile Include="Data\Collection.cpp" />
<ClCompile Include="Data\DateTime.cpp" />
@@ -284,16 +263,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="System\AceStreamHelper.cpp" />
- <ClCompile Include="System\ByteSourceFileImpl.cpp" />
- <ClCompile Include="System\ByteSourceMemoryImpl.cpp" />
- <ClCompile Include="System\ByteSourceSocketStreamImpl.cpp" />
- <ClCompile Include="System\ByteSourceStreamImpl.cpp" />
- <ClCompile Include="System\ClassFactory.cpp" />
- <ClCompile Include="System\Configuration.cpp" />
- <ClCompile Include="System\ConfigurationHeap.cpp" />
<ClCompile Include="System\ConfigurationSection.cpp" />
- <ClCompile Include="System\ConfigurationSectionCollection.cpp" />
<ClCompile Include="System\ConvertUTF.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
@@ -303,42 +273,23 @@
<ClCompile Include="System\Disposable.cpp" />
<ClCompile Include="System\DisposableCollection.cpp" />
<ClCompile Include="System\FileUtil.cpp" />
- <ClCompile Include="System\FoundationConfigProperties.cpp" />
<ClCompile Include="System\FoundationUnicodeString.cpp" />
<ClCompile Include="System\GuardDisposable.cpp" />
- <ClCompile Include="System\MemoryStreamHelper.cpp" />
<ClCompile Include="System\NamedSerializable.cpp" />
<ClCompile Include="System\Object.cpp" />
- <ClCompile Include="System\PacketParser.cpp" />
<ClCompile Include="System\Resources.cpp" />
<ClCompile Include="System\Serializable.cpp" />
- <ClCompile Include="System\ServerConnectionBase.cpp" />
<ClCompile Include="System\SetLocale.cpp" />
- <ClCompile Include="System\Stream.cpp" />
- <ClCompile Include="System\StreamData.cpp" />
- <ClCompile Include="System\StreamHelper.cpp" />
- <ClCompile Include="System\StreamParser.cpp" />
- <ClCompile Include="System\StreamReader.cpp" />
- <ClCompile Include="System\StreamWriter.cpp" />
<ClCompile Include="System\Util.cpp" />
- <ClCompile Include="System\XmlUtil.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Exception\ApplicationException.h" />
<ClInclude Include="Exception\ArgumentOutOfRangeException.h" />
<ClInclude Include="Exception\ClassNotFoundException.h" />
- <ClInclude Include="Exception\ConfigurationException.h" />
- <ClInclude Include="Exception\ConfigurationLoadFailedException.h" />
- <ClInclude Include="Exception\ConfigurationSaveFailedException.h" />
- <ClInclude Include="Exception\DateTimeException.h" />
- <ClInclude Include="Exception\DecryptionException.h" />
<ClInclude Include="Exception\DirectoryNotFoundException.h" />
- <ClInclude Include="Exception\DivideByZeroException.h" />
- <ClInclude Include="Exception\DomainException.h" />
<ClInclude Include="Exception\DuplicateDirectoryException.h" />
<ClInclude Include="Exception\DuplicateFileException.h" />
<ClInclude Include="Exception\DuplicateObjectException.h" />
- <ClInclude Include="Exception\EncryptionException.h" />
<ClInclude Include="Exception\Exception.h" />
<ClInclude Include="Exception\ExceptionDefs.h" />
<ClInclude Include="Exception\FileIoException.h" />
@@ -346,13 +297,9 @@
<ClInclude Include="Exception\GridDensityException.h" />
<ClInclude Include="Exception\IndexOutOfRangeException.h" />
<ClInclude Include="Exception\InvalidArgumentException.h" />
- <ClInclude Include="Exception\InvalidCastException.h" />
- <ClInclude Include="Exception\InvalidMimeTypeException.h" />
<ClInclude Include="Exception\InvalidOperationException.h" />
<ClInclude Include="Exception\InvalidPropertyTypeException.h" />
- <ClInclude Include="Exception\InvalidStreamHeaderException.h" />
<ClInclude Include="Exception\IoException.h" />
- <ClInclude Include="Exception\LengthException.h" />
<ClInclude Include="Exception\LogicException.h" />
<ClInclude Include="Exception\NotFiniteNumberException.h" />
<ClInclude Include="Exception\NotImplementedException.h" />
@@ -363,23 +310,14 @@
<ClInclude Include="Exception\OutOfMemoryException.h" />
<ClInclude Include="Exception\OutOfRangeException.h" />
<ClInclude Include="Exception\OverflowException.h" />
- <ClInclude Include="Exception\PlatformNotSupportedException.h" />
<ClInclude Include="Exception\ResourcesException.h" />
<ClInclude Include="Exception\ResourcesLoadFailedException.h" />
- <ClInclude Include="Exception\ResourceTagNotFoundException.h" />
<ClInclude Include="Exception\RuntimeException.h" />
- <ClInclude Include="Exception\StreamIoException.h" />
<ClInclude Include="Exception\SystemException.h" />
<ClInclude Include="Exception\TemporaryFileNotAvailableException.h" />
- <ClInclude Include="Exception\ThirdPartyException.h" />
<ClInclude Include="Exception\UnclassifiedException.h" />
- <ClInclude Include="Exception\UnderflowException.h" />
- <ClInclude Include="Exception\XmlException.h" />
- <ClInclude Include="Exception\XmlParserException.h" />
<ClInclude Include="Data\BatchPropertyCollection.h" />
<ClInclude Include="Data\Byte.h" />
- <ClInclude Include="Data\ByteReader.h" />
- <ClInclude Include="Data\ByteSink.h" />
<ClInclude Include="Data\ByteSource.h" />
<ClInclude Include="Data\Collection.h" />
<ClInclude Include="Data\DateTime.h" />
@@ -394,21 +332,12 @@
<ClInclude Include="Data\StringCollection.h" />
<ClInclude Include="Data\StringProperty.h" />
<ClInclude Include="stdafx.h" />
- <ClInclude Include="System\AceStreamHelper.h" />
<ClInclude Include="System\ArgumentPacket.h" />
<ClInclude Include="System\BasicPacket.h" />
<ClInclude Include="System\BinaryStreamArgumentPacket.h" />
- <ClInclude Include="System\ByteSourceFileImpl.h" />
<ClInclude Include="System\ByteSourceImpl.h" />
- <ClInclude Include="System\ByteSourceMemoryImpl.h" />
- <ClInclude Include="System\ByteSourceSocketStreamImpl.h" />
- <ClInclude Include="System\ByteSourceStreamImpl.h" />
- <ClInclude Include="System\ClassFactory.h" />
<ClInclude Include="System\CollectionPacket.h" />
- <ClInclude Include="System\Configuration.h" />
- <ClInclude Include="System\ConfigurationHeap.h" />
<ClInclude Include="System\ConfigurationSection.h" />
- <ClInclude Include="System\ConfigurationSectionCollection.h" />
<ClInclude Include="System\ControlPacket.h" />
<ClInclude Include="System\ConvertUTF.h" />
<ClInclude Include="System\FoundationUnicodeString.h" />
@@ -417,31 +346,19 @@
<ClInclude Include="System\DisposableCollection.h" />
<ClInclude Include="System\FileUtil.h" />
<ClInclude Include="System\FoundationClassId.h" />
- <ClInclude Include="System\FoundationConfigProperties.h" />
<ClInclude Include="System\GuardDisposable.h" />
<ClInclude Include="System\LinuxMemoryStatus.h" />
- <ClInclude Include="System\MemoryStreamHelper.h" />
<ClInclude Include="System\NamedSerializable.h" />
<ClInclude Include="System\Object.h" />
<ClInclude Include="System\OperationPacket.h" />
<ClInclude Include="System\OperationResponsePacket.h" />
- <ClInclude Include="System\PacketParser.h" />
<ClInclude Include="System\PacketStructure.h" />
<ClInclude Include="System\Ptr.h" />
<ClInclude Include="System\Resources.h" />
<ClInclude Include="System\Serializable.h" />
- <ClInclude Include="System\ServerConnectionBase.h" />
<ClInclude Include="System\SetLocale.h" />
- <ClInclude Include="System\Stream.h" />
- <ClInclude Include="System\StreamData.h" />
<ClInclude Include="System\StreamHeader.h" />
- <ClInclude Include="System\StreamHelper.h" />
- <ClInclude Include="System\StreamParser.h" />
- <ClInclude Include="System\StreamReader.h" />
- <ClInclude Include="System\StreamWriter.h" />
<ClInclude Include="System\Util.h" />
- <ClInclude Include="System\XmlDefs.h" />
- <ClInclude Include="System\XmlUtil.h" />
<ClInclude Include="Foundation.h" />
<ClInclude Include="FoundationDefs.h" />
</ItemGroup>
Modified: sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters
===================================================================
--- sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/Foundation.vcxproj.filters 2011-12-05 21:46:03 UTC (rev 6295)
@@ -21,30 +21,9 @@
<ClCompile Include="Exception\ClassNotFoundException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\ConfigurationException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\ConfigurationLoadFailedException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\ConfigurationSaveFailedException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\DateTimeException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\DecryptionException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\DirectoryNotFoundException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\DivideByZeroException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\DomainException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\DuplicateDirectoryException.cpp">
<Filter>Exception</Filter>
</ClCompile>
@@ -54,9 +33,6 @@
<ClCompile Include="Exception\DuplicateObjectException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\EncryptionException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\Exception.cpp">
<Filter>Exception</Filter>
</ClCompile>
@@ -75,33 +51,18 @@
<ClCompile Include="Exception\InvalidArgumentException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\InvalidCastException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\InvalidMimeTypeException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\InvalidOperationException.cpp">
<Filter>Exception</Filter>
</ClCompile>
<ClCompile Include="Exception\InvalidPropertyTypeException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\InvalidStreamHeaderException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\IoException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\LengthException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\LogicException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\NotFiniteNumberException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\NotImplementedException.cpp">
<Filter>Exception</Filter>
</ClCompile>
@@ -123,60 +84,30 @@
<ClCompile Include="Exception\OutOfRangeException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\OverflowException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\PlatformNotSupportedException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\ResourcesException.cpp">
<Filter>Exception</Filter>
</ClCompile>
<ClCompile Include="Exception\ResourcesLoadFailedException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\ResourceTagNotFoundException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\RuntimeException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\StreamIoException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\SystemException.cpp">
<Filter>Exception</Filter>
</ClCompile>
<ClCompile Include="Exception\TemporaryFileNotAvailableException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\ThirdPartyException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Exception\UnclassifiedException.cpp">
<Filter>Exception</Filter>
</ClCompile>
- <ClCompile Include="Exception\UnderflowException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\XmlException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
- <ClCompile Include="Exception\XmlParserException.cpp">
- <Filter>Exception</Filter>
- </ClCompile>
<ClCompile Include="Data\BatchPropertyCollection.cpp">
<Filter>Data</Filter>
</ClCompile>
<ClCompile Include="Data\Byte.cpp">
<Filter>Data</Filter>
</ClCompile>
- <ClCompile Include="Data\ByteReader.cpp">
- <Filter>Data</Filter>
- </ClCompile>
- <ClCompile Include="Data\ByteSink.cpp">
- <Filter>Data</Filter>
- </ClCompile>
<ClCompile Include="Data\ByteSource.cpp">
<Filter>Data</Filter>
</ClCompile>
@@ -210,36 +141,9 @@
<ClCompile Include="Data\StringProperty.cpp">
<Filter>Data</Filter>
</ClCompile>
- <ClCompile Include="System\AceStreamHelper.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ByteSourceFileImpl.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ByteSourceMemoryImpl.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ByteSourceSocketStreamImpl.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ByteSourceStreamImpl.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ClassFactory.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\Configuration.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\ConfigurationHeap.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\ConfigurationSection.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\ConfigurationSectionCollection.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\Disposable.cpp">
<Filter>System</Filter>
</ClCompile>
@@ -249,60 +153,27 @@
<ClCompile Include="System\FileUtil.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\FoundationConfigProperties.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\GuardDisposable.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\MemoryStreamHelper.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\NamedSerializable.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="System\Object.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\PacketParser.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\Resources.cpp">
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="System\Serializable.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\ServerConnectionBase.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\SetLocale.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\Stream.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\StreamData.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\StreamHelper.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\StreamParser.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\StreamReader.cpp">
- <Filter>System</Filter>
- </ClCompile>
- <ClCompile Include="System\StreamWriter.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\Util.cpp">
<Filter>System</Filter>
</ClCompile>
- <ClCompile Include="System\XmlUtil.cpp">
- <Filter>System</Filter>
- </ClCompile>
<ClCompile Include="System\FoundationUnicodeString.cpp">
<Filter>System</Filter>
</ClCompile>
@@ -310,6 +181,12 @@
<Filter>System</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
+ <ClCompile Include="Exception\OverflowException.cpp">
+ <Filter>Exception</Filter>
+ </ClCompile>
+ <ClCompile Include="Exception\NotFiniteNumberException.cpp">
+ <Filter>Exception</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Exception\ApplicationException.h">
@@ -321,30 +198,9 @@
<ClInclude Include="Exception\ClassNotFoundException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\ConfigurationException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\ConfigurationLoadFailedException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\ConfigurationSaveFailedException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\DateTimeException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\DecryptionException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\DirectoryNotFoundException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\DivideByZeroException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\DomainException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\DuplicateDirectoryException.h">
<Filter>Exception</Filter>
</ClInclude>
@@ -354,9 +210,6 @@
<ClInclude Include="Exception\DuplicateObjectException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\EncryptionException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\Exception.h">
<Filter>Exception</Filter>
</ClInclude>
@@ -378,33 +231,18 @@
<ClInclude Include="Exception\InvalidArgumentException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\InvalidCastException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\InvalidMimeTypeException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\InvalidOperationException.h">
<Filter>Exception</Filter>
</ClInclude>
<ClInclude Include="Exception\InvalidPropertyTypeException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\InvalidStreamHeaderException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\IoException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\LengthException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\LogicException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\NotFiniteNumberException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\NotImplementedException.h">
<Filter>Exception</Filter>
</ClInclude>
@@ -426,60 +264,30 @@
<ClInclude Include="Exception\OutOfRangeException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\OverflowException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\PlatformNotSupportedException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\ResourcesException.h">
<Filter>Exception</Filter>
</ClInclude>
<ClInclude Include="Exception\ResourcesLoadFailedException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\ResourceTagNotFoundException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\RuntimeException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\StreamIoException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\SystemException.h">
<Filter>Exception</Filter>
</ClInclude>
<ClInclude Include="Exception\TemporaryFileNotAvailableException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\ThirdPartyException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Exception\UnclassifiedException.h">
<Filter>Exception</Filter>
</ClInclude>
- <ClInclude Include="Exception\UnderflowException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\XmlException.h">
- <Filter>Exception</Filter>
- </ClInclude>
- <ClInclude Include="Exception\XmlParserException.h">
- <Filter>Exception</Filter>
- </ClInclude>
<ClInclude Include="Data\BatchPropertyCollection.h">
<Filter>Data</Filter>
</ClInclude>
<ClInclude Include="Data\Byte.h">
<Filter>Data</Filter>
</ClInclude>
- <ClInclude Include="Data\ByteReader.h">
- <Filter>Data</Filter>
- </ClInclude>
- <ClInclude Include="Data\ByteSink.h">
- <Filter>Data</Filter>
- </ClInclude>
<ClInclude Include="Data\ByteSource.h">
<Filter>Data</Filter>
</ClInclude>
@@ -519,9 +327,6 @@
<ClInclude Include="Data\StringProperty.h">
<Filter>Data</Filter>
</ClInclude>
- <ClInclude Include="System\AceStreamHelper.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\ArgumentPacket.h">
<Filter>System</Filter>
</ClInclude>
@@ -531,39 +336,15 @@
<ClInclude Include="System\BinaryStreamArgumentPacket.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\ByteSourceFileImpl.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\ByteSourceImpl.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\ByteSourceMemoryImpl.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\ByteSourceSocketStreamImpl.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\ByteSourceStreamImpl.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\ClassFactory.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\CollectionPacket.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\Configuration.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\ConfigurationHeap.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\ConfigurationSection.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\ConfigurationSectionCollection.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\ControlPacket.h">
<Filter>System</Filter>
</ClInclude>
@@ -579,18 +360,12 @@
<ClInclude Include="System\FoundationClassId.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\FoundationConfigProperties.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\GuardDisposable.h">
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="System\LinuxMemoryStatus.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\MemoryStreamHelper.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\NamedSerializable.h">
<Filter>System</Filter>
</ClInclude>
@@ -603,9 +378,6 @@
<ClInclude Include="System\OperationResponsePacket.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\PacketParser.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\PacketStructure.h">
<Filter>System</Filter>
</ClInclude>
@@ -618,42 +390,15 @@
<ClInclude Include="System\Serializable.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\ServerConnectionBase.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\SetLocale.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\Stream.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\StreamData.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\StreamHeader.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\StreamHelper.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\StreamParser.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\StreamReader.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\StreamWriter.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="System\Util.h">
<Filter>System</Filter>
</ClInclude>
- <ClInclude Include="System\XmlDefs.h">
- <Filter>System</Filter>
- </ClInclude>
- <ClInclude Include="System\XmlUtil.h">
- <Filter>System</Filter>
- </ClInclude>
<ClInclude Include="Foundation.h" />
<ClInclude Include="FoundationDefs.h" />
<ClInclude Include="System\Mutex.h">
@@ -666,6 +411,12 @@
<Filter>System</Filter>
</ClInclude>
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="Exception\OverflowException.h">
+ <Filter>Exception</Filter>
+ </ClInclude>
+ <ClInclude Include="Exception\NotFiniteNumberException.h">
+ <Filter>Exception</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Foundation.rc" />
Modified: sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,6 +18,8 @@
#include "stdafx.h"
#include "Foundation.h"
+#if WANT_ACE
+
//////////////////////////////////////////////////////////////////
///<summary>
/// Construct a ByteSourceMemoryImpl object
@@ -100,3 +102,5 @@
{
return (SAFE_ADDREF((MgByte*)m_data));
}
+
+#endif //WANT_ACE
Modified: sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/ByteSourceMemoryImpl.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -20,6 +20,7 @@
/// INTERNAL_CLASS - NOT EXPOSED
/// \cond INTERNAL
+#if WANT_ACE
class MgByte;
template class MG_FOUNDATION_API Ptr<MgByte>;
@@ -118,4 +119,6 @@
};
/// \endcond
+#endif //WANT_ACE
+
#endif // MG_BYTE_SOURCE_MEMORY_IMPL_H_
Modified: sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/FileUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -23,7 +23,7 @@
#include <direct.h>
-static CustomThreadMutex sm_mutex;
+static MgMutex sm_mutex;
static const wchar_t* sm_reservedCharacters = L"\\/:*?\"<>|";
static const wchar_t* sm_slash = L"\\/";
@@ -233,7 +233,7 @@
RemoveSlashFromEndOfPath(path);
{ // Begin guarding.
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
#ifdef _WIN32
success = ::_wstat(path.c_str(), &statInfo) == 0;
@@ -449,7 +449,7 @@
{
MG_TRY()
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
#ifdef _WIN32
int errCode = _wmkdir(MG_WCHAR_TO_TCHAR(path));
@@ -495,7 +495,7 @@
{
MG_TRY()
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
if (CleanDirectory(path, recursive, strict) == false)
{
@@ -544,7 +544,7 @@
MG_TRY()
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
if (!PathnameExists(path))
{
@@ -633,7 +633,7 @@
MG_TRY()
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
if (!PathnameExists(path))
{
@@ -851,7 +851,7 @@
char buffer[PATH_MAX];
#endif
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
#ifdef _WIN32
if (_wgetcwd(buffer, MAX_PATH) == NULL)
@@ -920,7 +920,7 @@
{
MG_TRY()
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
if (!PathnameExists(pathname))
{
@@ -1032,7 +1032,7 @@
__LINE__, __WFILE__, &arguments, L"", NULL);
}
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
if (overwrite)
{
@@ -1143,7 +1143,7 @@
// to the temporary file. Alternately, ACE_OS::mkstemp() could be used.
// Add current thread id to the mix to ensure that the name is unique.
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
string mbPrefix;
#if WANT_ACE
ACE_thread_t threadId = ACE_OS::thr_self();
@@ -1256,7 +1256,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(sm_mutex);
+ MgLock lock(sm_mutex);
FILE* file = NULL;
Modified: sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -22,7 +22,7 @@
//////////////////////////////////////////////////////////////
INT32 MgGuardDisposable::GetRefCount()
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
return m_refCount;
}
@@ -31,7 +31,7 @@
//////////////////////////////////////////////////////////////
INT32 MgGuardDisposable::AddRef()
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
m_refCountFlag = true;
@@ -52,7 +52,7 @@
INT32 MgGuardDisposable::Release()
{
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
m_refCountFlag = true;
@@ -82,7 +82,7 @@
//////////////////////////////////////////////////////////////
void MgGuardDisposable::SetRefCountFlag()
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
m_refCountFlag = true;
}
Modified: sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/GuardDisposable.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -89,7 +89,7 @@
private:
- CustomThreadMutex m_mutex;
+ MgMutex m_mutex;
};
/// \endcond
Modified: sandbox/adsk/vik/Common/Foundation/System/Mutex.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Mutex.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/Mutex.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -26,10 +26,10 @@
# endif
#endif
-class CustomThreadMutex
+class MgMutex
{
public:
- CustomThreadMutex()
+ MgMutex()
{
#ifdef _WIN32
::InitializeCriticalSection(&m_criticalSection);
@@ -41,7 +41,7 @@
#endif
}
- ~CustomThreadMutex()
+ ~MgMutex()
{
#ifdef _WIN32
::DeleteCriticalSection(&m_criticalSection);
@@ -59,6 +59,8 @@
#endif
}
+ void Enter() { Lock(); }
+
void Unlock()
{
#ifdef _WIN32
@@ -68,10 +70,12 @@
#endif
}
+ void Leave() { Unlock(); }
+
private:
// Unimplemented copy constructor and assignment operator.
- CustomThreadMutex(const CustomThreadMutex&);
- CustomThreadMutex& operator=(const CustomThreadMutex&);
+ MgMutex(const MgMutex&);
+ MgMutex& operator=(const MgMutex&);
#ifdef _WIN32
CRITICAL_SECTION m_criticalSection;
@@ -81,26 +85,26 @@
#endif
};
-class AutoMutexLocker
+class MgLock
{
public:
- AutoMutexLocker(CustomThreadMutex& mutex)
+ MgLock(MgMutex& mutex)
: m_mutex(mutex)
{
m_mutex.Lock();
}
- ~AutoMutexLocker()
+ ~MgLock()
{
m_mutex.Unlock();
}
private:
// Unimplemented copy constructor and assignment operator.
- AutoMutexLocker();
- AutoMutexLocker(const AutoMutexLocker&);
- AutoMutexLocker& operator=(const AutoMutexLocker&);
+ MgLock();
+ MgLock(const MgLock&);
+ MgLock& operator=(const MgLock&);
- CustomThreadMutex& m_mutex;
+ MgMutex& m_mutex;
};
Modified: sandbox/adsk/vik/Common/Foundation/System/StreamHelper.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/StreamHelper.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/StreamHelper.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -19,6 +19,8 @@
#include "Foundation.h"
#include "StreamHelper.h"
+#if WANT_ACE
+
//-------------------------------------------------------------------------
// Constructors/Destructors
//-------------------------------------------------------------------------
@@ -128,3 +130,5 @@
return stat;
}
+
+#endif //WANT_ACE
Modified: sandbox/adsk/vik/Common/Foundation/System/StreamHelper.h
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/StreamHelper.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/StreamHelper.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,6 +18,8 @@
#ifndef MG_STREAM_HELPER_H_
#define MG_STREAM_HELPER_H_
+#if WANT_ACE
+
class MgStreamHelper;
template class MG_FOUNDATION_API Ptr<MgStreamHelper>;
@@ -143,4 +145,6 @@
};
/// \endcond
+#endif //WANT_ACE
+
#endif // MG_STREAM_HELPER_H_
Modified: sandbox/adsk/vik/Common/Foundation/System/Util.cpp
===================================================================
--- sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Foundation/System/Util.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -856,7 +856,7 @@
#ifdef _WIN32
- throw new MgPlatformNotSupportedException(L"MgUtil.GetLinuxMemoryStatus", __LINE__, __WFILE__, NULL, L"", NULL);
+ return false;
#else
Modified: sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/AgfReaderWriter.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "AgfStream.h"
#if WANT_ACE
Modified: sandbox/adsk/vik/Common/Geometry/AgfStream.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AgfStream.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/AgfStream.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -19,7 +19,6 @@
#if WANT_ACE
-#include "GeometryCommon.h"
#include "AgfStream.h"
//////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/AggregateGeometry.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
//////////////////////////////////////////////////////////////////
// Get the unique identifier for the class
Modified: sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/ArcSegment.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "Spatial/SpatialUtility.h"
//////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/Coordinate.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Coordinate.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Coordinate.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
double const MgCoordinate::NoM = DoubleNan;
double const MgCoordinate::NoZ = DoubleNan;
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
// Construct an MgCoordinateCollection object
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateIterator.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -58,7 +58,7 @@
///
void MgCoordinateSystemCache::Clear()
{
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
for (MgCoordinateSystemMap::iterator i = m_coordinateSystemMap.begin();
i != m_coordinateSystemMap.end(); ++i)
@@ -94,7 +94,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
SAFE_RELEASE(m_coordinateSystemMap[key]);
m_coordinateSystemMap[key] = SAFE_ADDREF(value);
@@ -122,7 +122,7 @@
__LINE__, __WFILE__, NULL, L"", NULL);
}
- AutoMutexLocker lock(m_mutex);
+ MgLock lock(m_mutex);
return SAFE_ADDREF(m_coordinateSystemMap[key]);
}
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemCache.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -55,7 +55,7 @@
static MgCoordinateSystemCache sm_coordinateSystemCache;
- CustomThreadMutex m_mutex;
+ MgMutex m_mutex;
MgCoordinateSystemMap m_coordinateSystemMap;
};
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateSystem/CoordinateSystemFactory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,8 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
-#include "CoordSysCommon.h" //for COORDINATE_SYSTEM_API
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "CoordinateSystem.h" //for MgCoordinateSystem
#include "CoordSys.h" //for CCoordinateSystem
@@ -43,7 +41,7 @@
#include "CoordinateSystemCache.h"
#include "System/Mutex.h"
-CustomThreadMutex g_mutex;
+MgMutex g_mutex;
using namespace CSLibrary;
@@ -74,7 +72,7 @@
if (sm_pCatalog == NULL)
{
// Perform Double-Checked Locking Optimization.
- AutoMutexLocker lock(g_mutex);
+ MgLock lock(g_mutex);
if (sm_pCatalog == NULL)
{
//the catalog opens dictionaries for read by default
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXY.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCoordinateXY)
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYM.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCoordinateXYM)
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZ.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCoordinateXYZ)
Modified: sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CoordinateXYZM.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCoordinateXYZM)
Modified: sandbox/adsk/vik/Common/Geometry/Curve.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Curve.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Curve.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
//////////////////////////////////////////////////////////////////
// Get the unique identifier for the class
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygon.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCurvePolygon)
Modified: sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurvePolygonCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/CurveRing.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRing.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurveRing.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
// Construct a MgLinearRing object
Modified: sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurveRingCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurveSegmentCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/CurveString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurveString.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgCurveString)
Modified: sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/CurveStringCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/Envelope.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Envelope.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgEnvelope)
Modified: sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,7 +18,7 @@
#include "stdafx.h"
#include "GeometryException.h"
-IMPLEMENT_EXCEPTION_DEFAULTS(MgGeometryException, MgThirdPartyException)
+IMPLEMENT_EXCEPTION_DEFAULTS(MgGeometryException, MgException)
///////////////////////////////////////////////////////////////////////////////
/// \brief
@@ -27,7 +27,7 @@
MgGeometryException::MgGeometryException(CREFSTRING methodName,
INT32 lineNumber, CREFSTRING fileName, MgStringCollection* whatArguments,
CREFSTRING whyMessageId, MgStringCollection* whyArguments) throw() :
- MgThirdPartyException(methodName, lineNumber, fileName,
+ MgException(methodName, lineNumber, fileName,
whatArguments, whyMessageId, whyArguments)
{
}
Modified: sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Exception/GeometryException.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -24,7 +24,7 @@
/// \brief
/// Thrown when an error occurs calculating geometry.
///
-class MG_GEOMETRY_API MgGeometryException : public MgThirdPartyException
+class MG_GEOMETRY_API MgGeometryException : public MgException
{
DECLARE_CLASSNAME(MgGeometryException)
Modified: sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeometricEntity.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "GeosUtil.h"
///////////////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "Buffer/buffer.h"
#include "GeosUtil.h"
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj 2011-12-05 21:46:03 UTC (rev 6295)
@@ -194,7 +194,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\CoordinateSystem\CriticalSection.cpp" />
<ClCompile Include="Buffer\BorderWalker.cpp" />
<ClCompile Include="Buffer\bufrutil.cpp" />
<ClCompile Include="Buffer\eventarr.cpp" />
@@ -350,7 +349,6 @@
<ClCompile Include="WktReaderWriter.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="..\CoordinateSystem\CriticalSection.h" />
<ClInclude Include="Buffer\BorderWalker.h" />
<ClInclude Include="Buffer\buffer.h" />
<ClInclude Include="Buffer\bufraloc.h" />
Modified: sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Geometry.vcxproj.filters 2011-12-05 21:46:03 UTC (rev 6295)
@@ -368,9 +368,6 @@
<ClCompile Include="Region.cpp" />
<ClCompile Include="Ring.cpp" />
<ClCompile Include="WktReaderWriter.cpp" />
- <ClCompile Include="..\CoordinateSystem\CriticalSection.cpp">
- <Filter>CoordinateSystem_IMP</Filter>
- </ClCompile>
<ClCompile Include="stdafx.cpp" />
</ItemGroup>
<ItemGroup>
@@ -967,9 +964,6 @@
<ClInclude Include="Ring.h" />
<ClInclude Include="Transform.h" />
<ClInclude Include="WktReaderWriter.h" />
- <ClInclude Include="..\CoordinateSystem\CriticalSection.h">
- <Filter>CoordinateSystem_IMP</Filter>
- </ClInclude>
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
Modified: sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeometryClassFactory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
static bool InitializeStaticData();
Modified: sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeometryCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
// Construct a MgGeometryCollection objet
Modified: sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeometryFactory.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
static map<UINT32, MgGeometry*(*)()> createFuncs;
Modified: sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeometryUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#if WANT_ACE
Modified: sandbox/adsk/vik/Common/Geometry/GeosUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/GeosUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/GeosUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -23,7 +23,6 @@
#include "geos.h"
#pragma warning(pop)
-#include "GeometryCommon.h"
#include "Buffer/buffer.h"
#include "GeosUtil.h"
#include "GeometryExceptionDef.h"
Modified: sandbox/adsk/vik/Common/Geometry/LineString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineString.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/LineString.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgLineString)
Modified: sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/LineStringCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/LinearRing.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/LinearRing.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
// Construct a MgLinearRing object
Modified: sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/LinearRingCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/LinearSegment.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
//////////////////////////////////////////////////////////////////
// Construct a MgLinearSegment object
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurvePolygon.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgMultiCurvePolygon)
Modified: sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiCurveString.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgMultiCurveString)
Modified: sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiGeometry.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include <typeinfo>
MG_IMPL_DYNCREATE(MgMultiGeometry)
Modified: sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiLineString.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgMultiLineString)
Modified: sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiPoint.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgMultiPoint)
Modified: sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/MultiPolygon.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgMultiPolygon)
Modified: sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Parse/ParseAwktUtil.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "ParseAwktUtil.h"
Modified: sandbox/adsk/vik/Common/Geometry/Point.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Point.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Point.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgPoint)
Modified: sandbox/adsk/vik/Common/Geometry/PointCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PointCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/PointCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/Polygon.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Polygon.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
MG_IMPL_DYNCREATE(MgPolygon)
Modified: sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/PolygonCollection.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
///////////////////////////////////////////////////////////////////////////
///<summary>
Modified: sandbox/adsk/vik/Common/Geometry/Region.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Region.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Region.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "GeosUtil.h"
//////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/Ring.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Ring.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Ring.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "GeosUtil.h"
///////////////////////////////////////////////////////////////////////////
Modified: sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtility.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -17,7 +17,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "MathUtility.h"
#include "SpatialUtilityCircularArc.h"
#include "SpatialUtility.h"
Modified: sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/Spatial/SpatialUtilityCircularArc.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "SpatialUtility.h"
#include "SpatialUtilityCircularArc.h"
#include "MathUtility.h"
Modified: sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp
===================================================================
--- sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/WktReaderWriter.cpp 2011-12-05 21:46:03 UTC (rev 6295)
@@ -16,7 +16,6 @@
//
#include "stdafx.h"
-#include "GeometryCommon.h"
#include "Parse/ParseAwkt.h"
MG_IMPL_DYNCREATE(MgWktReaderWriter)
Modified: sandbox/adsk/vik/Common/Geometry/stdafx.h
===================================================================
--- sandbox/adsk/vik/Common/Geometry/stdafx.h 2011-12-05 20:40:39 UTC (rev 6294)
+++ sandbox/adsk/vik/Common/Geometry/stdafx.h 2011-12-05 21:46:03 UTC (rev 6295)
@@ -18,8 +18,6 @@
#include "Foundation.h"
#include "GeometryCommon.h"
-#include "CoordSysCommon.h"
-
#include "CoordSysCommon.h" //for COORDINATE_SYSTEM_API
#include "CoordSysUtil.h" //for Convert_Wide_To_Ascii, CsDictionaryOpenMode
#include "CoordinateSystem.h" //for MgCoordinateSystem
More information about the mapguide-commits
mailing list