[geos-commits] r2765 - trunk/source/noding/snapround

svn_geos at osgeo.org svn_geos at osgeo.org
Thu Dec 3 14:11:28 EST 2009


Author: mloskot
Date: 2009-12-03 14:11:28 -0500 (Thu, 03 Dec 2009)
New Revision: 2765

Modified:
   trunk/source/noding/snapround/MCIndexPointSnapper.cpp
Log:
Part 5 of larger changeset - source/noding/snapround:
* Declare noncopyable types as such explicitly (Ticket #304).
* Added Visual C++ pragmas.
* Tidy up.

Modified: trunk/source/noding/snapround/MCIndexPointSnapper.cpp
===================================================================
--- trunk/source/noding/snapround/MCIndexPointSnapper.cpp	2009-12-03 19:03:04 UTC (rev 2764)
+++ trunk/source/noding/snapround/MCIndexPointSnapper.cpp	2009-12-03 19:11:28 UTC (rev 2765)
@@ -39,12 +39,6 @@
 
 class HotPixelSnapAction: public index::chain::MonotoneChainSelectAction {
 
-private:
-	HotPixel& hotPixel;
-	SegmentString* parentEdge;
-	unsigned int vertexIndex;
-	bool isNodeAddedVar;
-
 public:
 
 	HotPixelSnapAction(HotPixel& nHotPixel,
@@ -80,12 +74,18 @@
 		::geos::ignore_unused_variable_warning(ls);
 	}
 
+private:
+	HotPixel& hotPixel;
+	SegmentString* parentEdge;
+	unsigned int vertexIndex;
+	bool isNodeAddedVar;
+
+    // Declare type as noncopyable
+    HotPixelSnapAction(const HotPixelSnapAction& other);
+    HotPixelSnapAction& operator=(const HotPixelSnapAction& rhs);
 };
 
 class MCIndexPointSnapperVisitor: public ItemVisitor {
-private:
-	const Envelope& pixelEnv;
-	chain::MonotoneChainSelectAction& action;
 
 public:
 	MCIndexPointSnapperVisitor(const Envelope& nPixelEnv, HotPixelSnapAction& nAction)
@@ -101,6 +101,14 @@
 			*(static_cast<chain::MonotoneChain*>(item));
 		testChain.select(pixelEnv, action);
 	}
+
+private:
+	const Envelope& pixelEnv;
+	chain::MonotoneChainSelectAction& action;
+
+    // Declare type as noncopyable
+    MCIndexPointSnapperVisitor(const MCIndexPointSnapperVisitor& other);
+    MCIndexPointSnapperVisitor& operator=(const MCIndexPointSnapperVisitor& rhs);
 };
 
 /* public */



More information about the geos-commits mailing list