[geos-commits] r2773 - trunk/source/headers/geos/geomgraph

svn_geos at osgeo.org svn_geos at osgeo.org
Thu Dec 3 14:36:17 EST 2009


Author: mloskot
Date: 2009-12-03 14:36:17 -0500 (Thu, 03 Dec 2009)
New Revision: 2773

Modified:
   trunk/source/headers/geos/geomgraph/GeometryGraph.h
   trunk/source/headers/geos/geomgraph/NodeMap.h
Log:
Part 12 of larger changeset - source/headers/geos/geomgraph:
* Declare noncopyable types as such explicitly (Ticket #304).
* Added Visual C++ pragmas.
* Tidy up.


Modified: trunk/source/headers/geos/geomgraph/GeometryGraph.h
===================================================================
--- trunk/source/headers/geos/geomgraph/GeometryGraph.h	2009-12-03 19:30:54 UTC (rev 2772)
+++ trunk/source/headers/geos/geomgraph/GeometryGraph.h	2009-12-03 19:36:17 UTC (rev 2773)
@@ -147,6 +147,10 @@
 	void addSelfIntersectionNode(int argIndex,
 		const geom::Coordinate& coord, int loc);
 
+    // Declare type as noncopyable
+    GeometryGraph(const GeometryGraph& other);
+    GeometryGraph& operator=(const GeometryGraph& rhs);
+
 public:
 
 	static bool isInBoundary(int boundaryCount);

Modified: trunk/source/headers/geos/geomgraph/NodeMap.h
===================================================================
--- trunk/source/headers/geos/geomgraph/NodeMap.h	2009-12-03 19:30:54 UTC (rev 2772)
+++ trunk/source/headers/geos/geomgraph/NodeMap.h	2009-12-03 19:36:17 UTC (rev 2773)
@@ -102,6 +102,12 @@
 		}
 #endif
 	}
+
+private:
+
+    // Declare type as noncopyable
+    NodeMap(const NodeMap& other);
+    NodeMap& operator=(const NodeMap& rhs);
 };
 
 } // namespace geos.geomgraph



More information about the geos-commits mailing list