[geos-commits] r2781 - trunk/source/headers/geos/operation/predicate

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 14:48:04 -0500 (Thu, 03 Dec 2009)
New Revision: 2781

Modified:
   trunk/source/headers/geos/operation/predicate/RectangleContains.h
   trunk/source/headers/geos/operation/predicate/RectangleIntersects.h
Log:
Part 20 of larger changeset - source/headers/geos/operation/overlay:
* Declare noncopyable types as such explicitly (Ticket #304).
* Unified EOL and style.
* Tidy up.

Modified: trunk/source/headers/geos/operation/predicate/RectangleContains.h
===================================================================
--- trunk/source/headers/geos/operation/predicate/RectangleContains.h	2009-12-03 19:46:43 UTC (rev 2780)
+++ trunk/source/headers/geos/operation/predicate/RectangleContains.h	2009-12-03 19:48:04 UTC (rev 2781)
@@ -110,7 +110,9 @@
 
 	bool contains(const geom::Geometry& geom);
 
-
+    // Declare type as noncopyable
+    RectangleContains(const RectangleContains& other);
+    RectangleContains& operator=(const RectangleContains& rhs);
 };
 
 

Modified: trunk/source/headers/geos/operation/predicate/RectangleIntersects.h
===================================================================
--- trunk/source/headers/geos/operation/predicate/RectangleIntersects.h	2009-12-03 19:46:43 UTC (rev 2780)
+++ trunk/source/headers/geos/operation/predicate/RectangleIntersects.h	2009-12-03 19:48:04 UTC (rev 2781)
@@ -53,6 +53,10 @@
 
  	const geom::Envelope &rectEnv;
 
+    // Declare type as noncopyable
+    RectangleIntersects(const RectangleIntersects& other);
+    RectangleIntersects& operator=(const RectangleIntersects& rhs);
+
 public:
 
 	/** \brief