[geos-commits] r2785 - trunk/source/headers/geos/simplify

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


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

Modified:
   trunk/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
   trunk/source/headers/geos/simplify/DouglasPeuckerSimplifier.h
   trunk/source/headers/geos/simplify/LineSegmentIndex.h
   trunk/source/headers/geos/simplify/TaggedLineSegment.h
   trunk/source/headers/geos/simplify/TaggedLineString.h
   trunk/source/headers/geos/simplify/TaggedLineStringSimplifier.h
   trunk/source/headers/geos/simplify/TaggedLinesSimplifier.h
   trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h
Log:
Part 24 of larger changeset - source/headers/geos/simplify:
* Declare noncopyable types as such explicitly (Ticket #304).
* Tidy up.

Modified: trunk/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H_
-#define _GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H_ 
+#ifndef GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H
+#define GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H
 
 #include <geos/export.h>
 #include <vector>
@@ -82,12 +82,16 @@
 	double distanceTolerance;
 
 	void simplifySection(size_t i, size_t j);
+
+    // Declare type as noncopyable
+    DouglasPeuckerLineSimplifier(const DouglasPeuckerLineSimplifier& other);
+    DouglasPeuckerLineSimplifier& operator=(const DouglasPeuckerLineSimplifier& rhs);
 };
 
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H_ 
+#endif // GEOS_SIMPLIFY_DOUBGLASPEUCKERLINESIMPLIFIER_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/DouglasPeuckerSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/DouglasPeuckerSimplifier.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/DouglasPeuckerSimplifier.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H_
-#define _GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H_ 
+#ifndef GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H
+#define GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H
 
 #include <geos/export.h>
 #include <memory> // for auto_ptr
@@ -84,7 +84,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H_ 
+#endif // GEOS_SIMPLIFY_DOUBGLASPEUCKERSIMPLIFIER_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/LineSegmentIndex.h
===================================================================
--- trunk/source/headers/geos/simplify/LineSegmentIndex.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/LineSegmentIndex.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -21,8 +21,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_LINESEGMENTINDEX_H_
-#define _GEOS_SIMPLIFY_LINESEGMENTINDEX_H_ 
+#ifndef GEOS_SIMPLIFY_LINESEGMENTINDEX_H
+#define GEOS_SIMPLIFY_LINESEGMENTINDEX_H
 
 #include <geos/export.h>
 #include <vector>
@@ -78,7 +78,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_LINESEGMENTINDEX_H_ 
+#endif // GEOS_SIMPLIFY_LINESEGMENTINDEX_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/TaggedLineSegment.h
===================================================================
--- trunk/source/headers/geos/simplify/TaggedLineSegment.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/TaggedLineSegment.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -27,8 +27,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H_
-#define _GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H_ 
+#ifndef GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H
+#define GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H
 
 #include <geos/export.h>
 #include <geos/geom/LineSegment.h> // for inheritance
@@ -84,7 +84,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H_ 
+#endif // GEOS_SIMPLIFY_TAGGEDLINESEGMENT_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/TaggedLineString.h
===================================================================
--- trunk/source/headers/geos/simplify/TaggedLineString.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/TaggedLineString.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -23,8 +23,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_TAGGEDLINESTRING_H_
-#define _GEOS_SIMPLIFY_TAGGEDLINESTRING_H_ 
+#ifndef GEOS_SIMPLIFY_TAGGEDLINESTRING_H
+#define GEOS_SIMPLIFY_TAGGEDLINESTRING_H
 
 #include <geos/export.h>
 #include <vector>
@@ -120,7 +120,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_TAGGEDLINESTRING_H_ 
+#endif // GEOS_SIMPLIFY_TAGGEDLINESTRING_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/TaggedLineStringSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/TaggedLineStringSimplifier.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/TaggedLineStringSimplifier.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -22,8 +22,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H_
-#define _GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H_ 
+#ifndef GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
+#define GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
 
 #include <geos/export.h>
 #include <vector>
@@ -152,7 +152,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H_ 
+#endif // GEOS_SIMPLIFY_TAGGEDLINESTRINGSIMPLIFIER_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/TaggedLinesSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/TaggedLinesSimplifier.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/TaggedLinesSimplifier.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -24,8 +24,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H_
-#define _GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H_ 
+#ifndef GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H
+#define GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H
 
 #include <geos/export.h>
 #include <vector>
@@ -113,7 +113,7 @@
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H_ 
+#endif // GEOS_SIMPLIFY_TAGGEDLINESSIMPLIFIER_H
 
 /**********************************************************************
  * $Log$

Modified: trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h
===================================================================
--- trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h	2009-12-03 19:52:22 UTC (rev 2784)
+++ trunk/source/headers/geos/simplify/TopologyPreservingSimplifier.h	2009-12-03 19:55:11 UTC (rev 2785)
@@ -21,8 +21,8 @@
  *
  **********************************************************************/
 
-#ifndef _GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H_
-#define _GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H_ 
+#ifndef GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H
+#define GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H
 
 #include <geos/export.h>
 #include <geos/geom/Geometry.h>
@@ -84,12 +84,10 @@
 
 };
 
-
-
 } // namespace geos::simplify
 } // namespace geos
 
-#endif // _GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H_ 
+#endif // GEOS_SIMPLIFY_TOPOLOGYPRESERVINGSIMPLIFIER_H
 
 /**********************************************************************
  * $Log$



More information about the geos-commits mailing list