[geos-commits] r2780 - in trunk/source/headers/geos/operation/overlay: . snap validate

svn_geos at osgeo.org svn_geos at osgeo.org
Thu Dec 3 14:46:43 EST 2009


Author: mloskot
Date: 2009-12-03 14:46:43 -0500 (Thu, 03 Dec 2009)
New Revision: 2780

Modified:
   trunk/source/headers/geos/operation/overlay/ElevationMatrix.h
   trunk/source/headers/geos/operation/overlay/snap/GeometrySnapper.h
   trunk/source/headers/geos/operation/overlay/snap/LineStringSnapper.h
   trunk/source/headers/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
   trunk/source/headers/geos/operation/overlay/snap/SnapOverlayOp.h
   trunk/source/headers/geos/operation/overlay/validate/FuzzyPointLocator.h
   trunk/source/headers/geos/operation/overlay/validate/OffsetPointGenerator.h
   trunk/source/headers/geos/operation/overlay/validate/OverlayResultValidator.h
Log:
Part 19 of larger changeset - source/headers/geos/operation/overlay:
* Declare noncopyable types as such explicitly (Ticket #304).
* Tidy up.
* Unified EOL and style.

Modified: trunk/source/headers/geos/operation/overlay/ElevationMatrix.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/ElevationMatrix.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/ElevationMatrix.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -64,6 +64,10 @@
 private:
 	ElevationMatrix &em;
 	double avgElevation;
+
+    // Declare type as noncopyable
+    ElevationMatrixFilter(const ElevationMatrixFilter& other);
+    ElevationMatrixFilter& operator=(const ElevationMatrixFilter& rhs);
 };
 
 

Modified: trunk/source/headers/geos/operation/overlay/snap/GeometrySnapper.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/snap/GeometrySnapper.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/snap/GeometrySnapper.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -117,6 +117,10 @@
 	/// Extract target (unique) coordinates
 	std::auto_ptr<geom::Coordinate::ConstVect> extractTargetCoordinates(
 			const geom::Geometry& g);
+
+    // Declare type as noncopyable
+    GeometrySnapper(const GeometrySnapper& other);
+    GeometrySnapper& operator=(const GeometrySnapper& rhs);
 };
 
 

Modified: trunk/source/headers/geos/operation/overlay/snap/LineStringSnapper.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/snap/LineStringSnapper.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/snap/LineStringSnapper.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -121,6 +121,9 @@
 			geom::CoordinateList::iterator from,
 			geom::CoordinateList::iterator too_far);
 
+    // Declare type as noncopyable
+    LineStringSnapper(const LineStringSnapper& other);
+    LineStringSnapper& operator=(const LineStringSnapper& rhs);
 };
 
 

Modified: trunk/source/headers/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -102,6 +102,9 @@
 	const geom::Geometry& geom0;
 	const geom::Geometry& geom1;
 
+    // Declare type as noncopyable
+    SnapIfNeededOverlayOp(const SnapIfNeededOverlayOp& other);
+    SnapIfNeededOverlayOp& operator=(const SnapIfNeededOverlayOp& rhs);
 };
  
 

Modified: trunk/source/headers/geos/operation/overlay/snap/SnapOverlayOp.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/snap/SnapOverlayOp.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/snap/SnapOverlayOp.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -119,6 +119,10 @@
 	double snapTolerance;
 
 	std::auto_ptr<precision::CommonBitsRemover> cbr;
+
+    // Declare type as noncopyable
+    SnapOverlayOp(const SnapOverlayOp& other);
+    SnapOverlayOp& operator=(const SnapOverlayOp& rhs);
 };
  
 

Modified: trunk/source/headers/geos/operation/overlay/validate/FuzzyPointLocator.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/validate/FuzzyPointLocator.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/validate/FuzzyPointLocator.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -77,7 +77,9 @@
 	/// @return a lineal geometry containing the extracted linework
 	std::auto_ptr<geom::Geometry> extractLineWork(const geom::Geometry& geom);
 
-
+    // Declare type as noncopyable
+    FuzzyPointLocator(const FuzzyPointLocator& other);
+    FuzzyPointLocator& operator=(const FuzzyPointLocator& rhs);
 };
 
 } // namespace geos::operation::overlay::validate

Modified: trunk/source/headers/geos/operation/overlay/validate/OffsetPointGenerator.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/validate/OffsetPointGenerator.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/validate/OffsetPointGenerator.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -66,6 +66,10 @@
 
 	void computeOffsets(const geom::Coordinate& p0,
 			const geom::Coordinate& p1);
+
+    // Declare type as noncopyable
+    OffsetPointGenerator(const OffsetPointGenerator& other);
+    OffsetPointGenerator& operator=(const OffsetPointGenerator& rhs);
 };
 
 } // namespace geos::operation::overlay::validate

Modified: trunk/source/headers/geos/operation/overlay/validate/OverlayResultValidator.h
===================================================================
--- trunk/source/headers/geos/operation/overlay/validate/OverlayResultValidator.h	2009-12-03 19:45:53 UTC (rev 2779)
+++ trunk/source/headers/geos/operation/overlay/validate/OverlayResultValidator.h	2009-12-03 19:46:43 UTC (rev 2780)
@@ -111,6 +111,9 @@
 	static double computeBoundaryDistanceTolerance(
 		const geom::Geometry& g0, const geom::Geometry& g1);
 
+    // Declare type as noncopyable
+    OverlayResultValidator(const OverlayResultValidator& other);
+    OverlayResultValidator& operator=(const OverlayResultValidator& rhs);
 };
 
 } // namespace geos::operation::overlay::validate



More information about the geos-commits mailing list