[geos-commits] r2775 - trunk/source/headers/geos/io

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-12-03 14:38:12 -0500 (Thu, 03 Dec 2009)
New Revision: 2775

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


Modified: trunk/source/headers/geos/io/StringTokenizer.h
===================================================================
--- trunk/source/headers/geos/io/StringTokenizer.h	2009-12-03 19:36:56 UTC (rev 2774)
+++ trunk/source/headers/geos/io/StringTokenizer.h	2009-12-03 19:38:12 UTC (rev 2775)
@@ -48,6 +48,10 @@
 	std::string stok;
 	double ntok;
 	std::string::const_iterator iter;
+
+    // Declare type as noncopyable
+    StringTokenizer(const StringTokenizer& other);
+    StringTokenizer& operator=(const StringTokenizer& rhs);
 };
 
 } // namespace io

Modified: trunk/source/headers/geos/io/WKBReader.h
===================================================================
--- trunk/source/headers/geos/io/WKBReader.h	2009-12-03 19:36:56 UTC (rev 2774)
+++ trunk/source/headers/geos/io/WKBReader.h	2009-12-03 19:38:12 UTC (rev 2775)
@@ -154,7 +154,9 @@
 
 	void readCoordinate(); // throws IOException
 
-
+    // Declare type as noncopyable
+    WKBReader(const WKBReader& other);
+    WKBReader& operator=(const WKBReader& rhs);
 };
 
 } // namespace io