[geos-commits] r3462 - in branches/3.3: include/geos/operation/buffer include/geos/operation/relate src/geom/util src/operation/relate

[svn_geos at osgeo.org]

Author: strk
Date: 2011-08-24 07:54:04 -0700 (Wed, 24 Aug 2011)
New Revision: 3462

Modified:
   branches/3.3/include/geos/operation/buffer/OffsetSegmentGenerator.h
   branches/3.3/include/geos/operation/relate/RelateComputer.h
   branches/3.3/src/geom/util/SineStarFactory.cpp
   branches/3.3/src/operation/relate/RelateComputer.cpp
Log:
Fix warnings on MSVC 2008 64 Bit (#470)


Modified: branches/3.3/include/geos/operation/buffer/OffsetSegmentGenerator.h
===================================================================
--- branches/3.3/include/geos/operation/buffer/OffsetSegmentGenerator.h	2011-08-20 21:02:57 UTC (rev 3461)
+++ branches/3.3/include/geos/operation/buffer/OffsetSegmentGenerator.h	2011-08-24 14:54:04 UTC (rev 3462)
@@ -337,6 +337,11 @@
    */
   void addFillet(const geom::Coordinate &p, double startAngle,
                  double endAngle, int direction, double radius);
+private:
+	// An OffsetSegmentGenerator cannot be copied because of member "const BufferParameters& bufParams"
+	// Not declaring these functions triggers MSVC warning C4512: "assignment operator could not be generated"
+	OffsetSegmentGenerator(const OffsetSegmentGenerator&);
+	void operator=(const OffsetSegmentGenerator&);
 
 };
 

Modified: branches/3.3/include/geos/operation/relate/RelateComputer.h
===================================================================
--- branches/3.3/include/geos/operation/relate/RelateComputer.h	2011-08-20 21:02:57 UTC (rev 3461)
+++ branches/3.3/include/geos/operation/relate/RelateComputer.h	2011-08-24 14:54:04 UTC (rev 3462)
@@ -75,6 +75,8 @@
 class GEOS_DLL RelateComputer {
 public:
 	RelateComputer(std::vector<geomgraph::GeometryGraph*> *newArg);
+	~RelateComputer();
+
 	geom::IntersectionMatrix* computeIM();
 private:
 

Modified: branches/3.3/src/geom/util/SineStarFactory.cpp
===================================================================
--- branches/3.3/src/geom/util/SineStarFactory.cpp	2011-08-20 21:02:57 UTC (rev 3461)
+++ branches/3.3/src/geom/util/SineStarFactory.cpp	2011-08-24 14:54:04 UTC (rev 3462)
@@ -20,8 +20,11 @@
 #include <geos/geom/util/SineStarFactory.h>
 #include <geos/geom/Coordinate.h>
 #include <geos/geom/CoordinateSequenceFactory.h>
+#include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/Envelope.h>
+#include <geos/geom/Polygon.h>
+#include <geos/geom/LinearRing.h>
 
 #include <vector>
 #include <cmath>

Modified: branches/3.3/src/operation/relate/RelateComputer.cpp
===================================================================
--- branches/3.3/src/operation/relate/RelateComputer.cpp	2011-08-20 21:02:57 UTC (rev 3461)
+++ branches/3.3/src/operation/relate/RelateComputer.cpp	2011-08-24 14:54:04 UTC (rev 3462)
@@ -55,6 +55,10 @@
 {
 }
 
+RelateComputer::~RelateComputer()
+{
+}
+
 IntersectionMatrix*
 RelateComputer::computeIM()
 {