[geos-commits] r2783 -
trunk/source/headers/geos/planargraph/algorithm
svn_geos at osgeo.org
svn_geos at osgeo.org
Thu Dec 3 14:51:16 EST 2009
Author: mloskot
Date: 2009-12-03 14:51:16 -0500 (Thu, 03 Dec 2009)
New Revision: 2783
Modified:
trunk/source/headers/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
Log:
Part 22 of larger changeset - source/headers/geos/planargraph/algorithm:
* Declare noncopyable types as such explicitly (Ticket #304).
* Tidy up.
Modified: trunk/source/headers/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
===================================================================
--- trunk/source/headers/geos/planargraph/algorithm/ConnectedSubgraphFinder.h 2009-12-03 19:50:26 UTC (rev 2782)
+++ trunk/source/headers/geos/planargraph/algorithm/ConnectedSubgraphFinder.h 2009-12-03 19:51:16 UTC (rev 2783)
@@ -43,7 +43,25 @@
*/
class GEOS_DLL ConnectedSubgraphFinder
{
+public:
+
+ ConnectedSubgraphFinder(PlanarGraph& newGraph)
+ :
+ graph(newGraph)
+ {}
+
+ /// \brief
+ /// Store newly allocated connected Subgraphs into the
+ /// given std::vector
+ ///
+ /// Caller take responsibility in releasing memory associated
+ /// with the subgraphs themself.
+ ///
+ ///
+ void getConnectedSubgraphs(std::vector<Subgraph *>& dest);
+
private:
+
PlanarGraph& graph;
/// Returns a newly allocated Subgraph
@@ -66,23 +84,9 @@
void addEdges(Node* node, std::stack<Node *>& nodeStack,
Subgraph* subgraph);
-public:
-
- ConnectedSubgraphFinder(PlanarGraph& newGraph)
- :
- graph(newGraph)
- {}
-
- /// \brief
- /// Store newly allocated connected Subgraphs into the
- /// given std::vector
- ///
- /// Caller take responsibility in releasing memory associated
- /// with the subgraphs themself.
- ///
- ///
- void getConnectedSubgraphs(std::vector<Subgraph *>& dest);
-
+ // Declare type as noncopyable
+ ConnectedSubgraphFinder(const ConnectedSubgraphFinder& other);
+ ConnectedSubgraphFinder& operator=(const ConnectedSubgraphFinder& rhs);
};
} // namespace geos::planargraph::algorithm
More information about the geos-commits
mailing list