[geos-commits] r2784 - trunk/source/headers/geos/planargraph

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 14:52:22 -0500 (Thu, 03 Dec 2009)
New Revision: 2784

Modified:
   trunk/source/headers/geos/planargraph/Subgraph.h
Log:
Part 23 of larger changeset - source/headers/geos/planargraph
* Declare noncopyable types as such explicitly (Ticket #304).
* Tidy up.

Modified: trunk/source/headers/geos/planargraph/Subgraph.h
===================================================================
--- trunk/source/headers/geos/planargraph/Subgraph.h	2009-12-03 19:51:16 UTC (rev 2783)
+++ trunk/source/headers/geos/planargraph/Subgraph.h	2009-12-03 19:52:22 UTC (rev 2784)
@@ -48,12 +48,6 @@
 ///
 class GEOS_DLL Subgraph
 {
-protected:
-	PlanarGraph &parentGraph;
-	std::set<Edge*> edges;
-	std::vector<const DirectedEdge*> dirEdges;
-	NodeMap nodeMap;
-
 public:
 	/**
 	 * Creates a new subgraph of the given PlanarGraph
@@ -136,7 +130,16 @@
 	 */
 	bool contains(Edge *e) { return (edges.find(e) != edges.end()); }
 
-	
+protected:
+
+	PlanarGraph &parentGraph;
+	std::set<Edge*> edges;
+	std::vector<const DirectedEdge*> dirEdges;
+	NodeMap nodeMap;
+    
+    // Declare type as noncopyable
+    Subgraph(const Subgraph& other);
+    Subgraph& operator=(const Subgraph& rhs);
 };