[geos-commits] [SCM] geos branch master updated. 759255faaeb946e59266460d41a08e1eb70233e8
git at osgeo.org
git at osgeo.org
Sun Jan 14 02:13:53 PST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".
The branch, master has been updated
via 759255faaeb946e59266460d41a08e1eb70233e8 (commit)
from 227ad17e4a9ef8d009d16240de492d4b5df70bcc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 759255faaeb946e59266460d41a08e1eb70233e8
Author: cvvergara <vicky at georepublic.de>
Date: Sat Jan 13 11:37:14 2018 -0600
Explicitly dissallow copy & assignment using c++11 syntax
diff --git a/include/geos/algorithm/ConvexHull.inl b/include/geos/algorithm/ConvexHull.inl
index 566bf33..da092af 100644
--- a/include/geos/algorithm/ConvexHull.inl
+++ b/include/geos/algorithm/ConvexHull.inl
@@ -7,7 +7,7 @@
*
* This is free software; you can redistribute and/or modify it under
* the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation.
* See the COPYING file for more information.
*
**********************************************************************
@@ -27,7 +27,7 @@
namespace geos {
namespace algorithm { // geos::algorithm
-INLINE
+INLINE
ConvexHull::ConvexHull(const geom::Geometry *newGeometry)
:
geomFactory(newGeometry->getFactory())
@@ -35,7 +35,7 @@ ConvexHull::ConvexHull(const geom::Geometry *newGeometry)
extractCoordinates(newGeometry);
}
-INLINE
+INLINE
ConvexHull::~ConvexHull()
{
}
diff --git a/include/geos/algorithm/RayCrossingCounter.h b/include/geos/algorithm/RayCrossingCounter.h
index 7703b0e..f1d0e0b 100644
--- a/include/geos/algorithm/RayCrossingCounter.h
+++ b/include/geos/algorithm/RayCrossingCounter.h
@@ -74,8 +74,8 @@ private:
bool isPointOnSegment;
// Declare type as noncopyable
- RayCrossingCounter(const RayCrossingCounter& other);
- RayCrossingCounter& operator=(const RayCrossingCounter& rhs);
+ RayCrossingCounter(const RayCrossingCounter& other) = delete;
+ RayCrossingCounter& operator=(const RayCrossingCounter& rhs) = delete;
public:
/**
diff --git a/include/geos/algorithm/distance/DiscreteFrechetDistance.h b/include/geos/algorithm/distance/DiscreteFrechetDistance.h
index 180eafd..bc7eb14 100644
--- a/include/geos/algorithm/distance/DiscreteFrechetDistance.h
+++ b/include/geos/algorithm/distance/DiscreteFrechetDistance.h
@@ -169,8 +169,8 @@ private:
double densifyFrac; // = 0.0;
// Declare type as noncopyable
- DiscreteFrechetDistance(const DiscreteFrechetDistance& other);
- DiscreteFrechetDistance& operator=(const DiscreteFrechetDistance& rhs);
+ DiscreteFrechetDistance(const DiscreteFrechetDistance& other) = delete;
+ DiscreteFrechetDistance& operator=(const DiscreteFrechetDistance& rhs) = delete;
};
} // geos::algorithm::distance
diff --git a/include/geos/algorithm/distance/DiscreteHausdorffDistance.h b/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
index 4e6c320..72fbdd1 100644
--- a/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
+++ b/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
@@ -242,8 +242,8 @@ private:
double densifyFrac; // = 0.0;
// Declare type as noncopyable
- DiscreteHausdorffDistance(const DiscreteHausdorffDistance& other);
- DiscreteHausdorffDistance& operator=(const DiscreteHausdorffDistance& rhs);
+ DiscreteHausdorffDistance(const DiscreteHausdorffDistance& other) = delete;
+ DiscreteHausdorffDistance& operator=(const DiscreteHausdorffDistance& rhs) = delete;
};
} // geos::algorithm::distance
diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
index d10b290..b0e44d2 100644
--- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
+++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
@@ -97,8 +97,8 @@ private:
void buildIndex( const geom::Geometry & g);
// Declare type as noncopyable
- IndexedPointInAreaLocator(const IndexedPointInAreaLocator& other);
- IndexedPointInAreaLocator& operator=(const IndexedPointInAreaLocator& rhs);
+ IndexedPointInAreaLocator(const IndexedPointInAreaLocator& other) = delete;
+ IndexedPointInAreaLocator& operator=(const IndexedPointInAreaLocator& rhs) = delete;
public:
/**
diff --git a/include/geos/geom/prep/PreparedLineStringIntersects.h b/include/geos/geom/prep/PreparedLineStringIntersects.h
index 55b2051..a1aef89 100644
--- a/include/geos/geom/prep/PreparedLineStringIntersects.h
+++ b/include/geos/geom/prep/PreparedLineStringIntersects.h
@@ -88,8 +88,8 @@ protected:
bool isAnyTestPointInTarget(const geom::Geometry * testGeom) const;
// Declare type as noncopyable
- PreparedLineStringIntersects(const PreparedLineStringIntersects& other);
- PreparedLineStringIntersects& operator=(const PreparedLineStringIntersects& rhs);
+ PreparedLineStringIntersects(const PreparedLineStringIntersects& other) = delete;
+ PreparedLineStringIntersects& operator=(const PreparedLineStringIntersects& rhs) = delete;
};
} // namespace geos::geom::prep
diff --git a/include/geos/geom/prep/PreparedPolygonPredicate.h b/include/geos/geom/prep/PreparedPolygonPredicate.h
index 7a4069c..adb5f89 100644
--- a/include/geos/geom/prep/PreparedPolygonPredicate.h
+++ b/include/geos/geom/prep/PreparedPolygonPredicate.h
@@ -58,8 +58,8 @@ class PreparedPolygonPredicate
{
private:
// Declare type as noncopyable
- PreparedPolygonPredicate(const PreparedPolygonPredicate& other);
- PreparedPolygonPredicate& operator=(const PreparedPolygonPredicate& rhs);
+ PreparedPolygonPredicate(const PreparedPolygonPredicate& other) = delete;
+ PreparedPolygonPredicate& operator=(const PreparedPolygonPredicate& rhs) = delete;
protected:
const PreparedPolygon * const prepPoly;
diff --git a/include/geos/geom/util/ComponentCoordinateExtracter.h b/include/geos/geom/util/ComponentCoordinateExtracter.h
index 3f54ab6..5224dfe 100644
--- a/include/geos/geom/util/ComponentCoordinateExtracter.h
+++ b/include/geos/geom/util/ComponentCoordinateExtracter.h
@@ -62,8 +62,8 @@ private:
Coordinate::ConstVect &comps;
// Declare type as noncopyable
- ComponentCoordinateExtracter(const ComponentCoordinateExtracter& other);
- ComponentCoordinateExtracter& operator=(const ComponentCoordinateExtracter& rhs);
+ ComponentCoordinateExtracter(const ComponentCoordinateExtracter& other) = delete;
+ ComponentCoordinateExtracter& operator=(const ComponentCoordinateExtracter& rhs) = delete;
};
} // namespace geos.geom.util
diff --git a/include/geos/geom/util/GeometryCombiner.h b/include/geos/geom/util/GeometryCombiner.h
index 8a8681b..1b5f4db 100644
--- a/include/geos/geom/util/GeometryCombiner.h
+++ b/include/geos/geom/util/GeometryCombiner.h
@@ -107,8 +107,8 @@ private:
void extractElements(Geometry* geom, std::vector<Geometry*>& elems);
// Declare type as noncopyable
- GeometryCombiner(const GeometryCombiner& other);
- GeometryCombiner& operator=(const GeometryCombiner& rhs);
+ GeometryCombiner(const GeometryCombiner& other) = delete;
+ GeometryCombiner& operator=(const GeometryCombiner& rhs) = delete;
};
} // namespace geos.geom.util
diff --git a/include/geos/geom/util/GeometryExtracter.h b/include/geos/geom/util/GeometryExtracter.h
index 827ec54..94b6eb4 100644
--- a/include/geos/geom/util/GeometryExtracter.h
+++ b/include/geos/geom/util/GeometryExtracter.h
@@ -87,8 +87,8 @@ private:
};
// Declare type as noncopyable
- GeometryExtracter(const GeometryExtracter& other);
- GeometryExtracter& operator=(const GeometryExtracter& rhs);
+ GeometryExtracter(const GeometryExtracter& other) = delete;
+ GeometryExtracter& operator=(const GeometryExtracter& rhs) = delete;
};
} // namespace geos.geom.util
diff --git a/include/geos/geom/util/GeometryTransformer.h b/include/geos/geom/util/GeometryTransformer.h
index 410feea..cff3ea0 100644
--- a/include/geos/geom/util/GeometryTransformer.h
+++ b/include/geos/geom/util/GeometryTransformer.h
@@ -186,8 +186,8 @@ private:
bool skipTransformedInvalidInteriorRings;
// Declare type as noncopyable
- GeometryTransformer(const GeometryTransformer& other);
- GeometryTransformer& operator=(const GeometryTransformer& rhs);
+ GeometryTransformer(const GeometryTransformer& other) = delete;
+ GeometryTransformer& operator=(const GeometryTransformer& rhs) = delete;
};
diff --git a/include/geos/geom/util/LinearComponentExtracter.h b/include/geos/geom/util/LinearComponentExtracter.h
index 1f2b4e7..66a4e52 100644
--- a/include/geos/geom/util/LinearComponentExtracter.h
+++ b/include/geos/geom/util/LinearComponentExtracter.h
@@ -39,8 +39,8 @@ private:
LineString::ConstVect &comps;
// Declare type as noncopyable
- LinearComponentExtracter(const LinearComponentExtracter& other);
- LinearComponentExtracter& operator=(const LinearComponentExtracter& rhs);
+ LinearComponentExtracter(const LinearComponentExtracter& other) = delete;
+ LinearComponentExtracter& operator=(const LinearComponentExtracter& rhs) = delete;
public:
/**
diff --git a/include/geos/geom/util/PointExtracter.h b/include/geos/geom/util/PointExtracter.h
index a9449c3..9b7ba08 100644
--- a/include/geos/geom/util/PointExtracter.h
+++ b/include/geos/geom/util/PointExtracter.h
@@ -55,8 +55,8 @@ private:
Point::ConstVect& comps;
// Declare type as noncopyable
- PointExtracter(const PointExtracter& other);
- PointExtracter& operator=(const PointExtracter& rhs);
+ PointExtracter(const PointExtracter& other) = delete;
+ PointExtracter& operator=(const PointExtracter& rhs) = delete;
};
} // namespace geos.geom.util
diff --git a/include/geos/geom/util/PolygonExtracter.h b/include/geos/geom/util/PolygonExtracter.h
index fe5b6b2..049a40d 100644
--- a/include/geos/geom/util/PolygonExtracter.h
+++ b/include/geos/geom/util/PolygonExtracter.h
@@ -58,8 +58,8 @@ private:
std::vector<const Polygon*>& comps;
// Declare type as noncopyable
- PolygonExtracter(const PolygonExtracter& other);
- PolygonExtracter& operator=(const PolygonExtracter& rhs);
+ PolygonExtracter(const PolygonExtracter& other) = delete;
+ PolygonExtracter& operator=(const PolygonExtracter& rhs) = delete;
};
} // namespace geos.geom.util
diff --git a/include/geos/geomgraph/GeometryGraph.h b/include/geos/geomgraph/GeometryGraph.h
index bb59761..d91931b 100644
--- a/include/geos/geomgraph/GeometryGraph.h
+++ b/include/geos/geomgraph/GeometryGraph.h
@@ -155,8 +155,8 @@ private:
const geom::Coordinate& coord, int loc);
// Declare type as noncopyable
- GeometryGraph(const GeometryGraph& other);
- GeometryGraph& operator=(const GeometryGraph& rhs);
+ GeometryGraph(const GeometryGraph& other) = delete;
+ GeometryGraph& operator=(const GeometryGraph& rhs) = delete;
public:
diff --git a/include/geos/geomgraph/NodeMap.h b/include/geos/geomgraph/NodeMap.h
index 56e2992..15bca8a 100644
--- a/include/geos/geomgraph/NodeMap.h
+++ b/include/geos/geomgraph/NodeMap.h
@@ -110,8 +110,8 @@ public:
private:
// Declare type as noncopyable
- NodeMap(const NodeMap& other);
- NodeMap& operator=(const NodeMap& rhs);
+ NodeMap(const NodeMap& other) = delete;
+ NodeMap& operator=(const NodeMap& rhs) = delete;
};
} // namespace geos.geomgraph
diff --git a/include/geos/index/chain/MonotoneChain.h b/include/geos/index/chain/MonotoneChain.h
index 97457c3..2873bae 100644
--- a/include/geos/index/chain/MonotoneChain.h
+++ b/include/geos/index/chain/MonotoneChain.h
@@ -167,8 +167,8 @@ private:
int id;
// Declare type as noncopyable
- MonotoneChain(const MonotoneChain& other);
- MonotoneChain& operator=(const MonotoneChain& rhs);
+ MonotoneChain(const MonotoneChain& other) = delete;
+ MonotoneChain& operator=(const MonotoneChain& rhs) = delete;
};
} // namespace geos::index::chain
diff --git a/include/geos/io/StringTokenizer.h b/include/geos/io/StringTokenizer.h
index 04571d8..7901326 100644
--- a/include/geos/io/StringTokenizer.h
+++ b/include/geos/io/StringTokenizer.h
@@ -54,8 +54,8 @@ private:
std::string::const_iterator iter;
// Declare type as noncopyable
- StringTokenizer(const StringTokenizer& other);
- StringTokenizer& operator=(const StringTokenizer& rhs);
+ StringTokenizer(const StringTokenizer& other) = delete;
+ StringTokenizer& operator=(const StringTokenizer& rhs) = delete;
};
} // namespace io
diff --git a/include/geos/io/WKBReader.h b/include/geos/io/WKBReader.h
index 831ed6c..b9399ba 100644
--- a/include/geos/io/WKBReader.h
+++ b/include/geos/io/WKBReader.h
@@ -158,8 +158,8 @@ private:
void readCoordinate(); // throws IOException
// Declare type as noncopyable
- WKBReader(const WKBReader& other);
- WKBReader& operator=(const WKBReader& rhs);
+ WKBReader(const WKBReader& other) = delete;
+ WKBReader& operator=(const WKBReader& rhs) = delete;
};
} // namespace io
diff --git a/include/geos/linearref/LinearIterator.h b/include/geos/linearref/LinearIterator.h
index a4f1912..3b978ed 100644
--- a/include/geos/linearref/LinearIterator.h
+++ b/include/geos/linearref/LinearIterator.h
@@ -149,8 +149,8 @@ private:
void loadCurrentLine();
// Declare type as noncopyable
- LinearIterator(const LinearIterator& other);
- LinearIterator& operator=(const LinearIterator& rhs);
+ LinearIterator(const LinearIterator& other) = delete;
+ LinearIterator& operator=(const LinearIterator& rhs) = delete;
};
}} // namespace geos::linearref
diff --git a/include/geos/noding/FastNodingValidator.h b/include/geos/noding/FastNodingValidator.h
index f1d89d7..9675c58 100644
--- a/include/geos/noding/FastNodingValidator.h
+++ b/include/geos/noding/FastNodingValidator.h
@@ -111,8 +111,8 @@ private:
void checkInteriorIntersections();
// Declare type as noncopyable
- FastNodingValidator(const FastNodingValidator& other);
- FastNodingValidator& operator=(const FastNodingValidator& rhs);
+ FastNodingValidator(const FastNodingValidator& other) = delete;
+ FastNodingValidator& operator=(const FastNodingValidator& rhs) = delete;
};
} // namespace geos.noding
diff --git a/include/geos/noding/IntersectionAdder.h b/include/geos/noding/IntersectionAdder.h
index d32b955..e1689df 100644
--- a/include/geos/noding/IntersectionAdder.h
+++ b/include/geos/noding/IntersectionAdder.h
@@ -85,8 +85,8 @@ private:
const SegmentString* e1, int segIndex1);
// Declare type as noncopyable
- IntersectionAdder(const IntersectionAdder& other);
- IntersectionAdder& operator=(const IntersectionAdder& rhs);
+ IntersectionAdder(const IntersectionAdder& other) = delete;
+ IntersectionAdder& operator=(const IntersectionAdder& rhs) = delete;
public:
diff --git a/include/geos/noding/IntersectionFinderAdder.h b/include/geos/noding/IntersectionFinderAdder.h
index 4c9184e..4759b39 100644
--- a/include/geos/noding/IntersectionFinderAdder.h
+++ b/include/geos/noding/IntersectionFinderAdder.h
@@ -100,8 +100,8 @@ private:
std::vector<geom::Coordinate>& interiorIntersections;
// Declare type as noncopyable
- IntersectionFinderAdder(const IntersectionFinderAdder& other);
- IntersectionFinderAdder& operator=(const IntersectionFinderAdder& rhs);
+ IntersectionFinderAdder(const IntersectionFinderAdder& other) = delete;
+ IntersectionFinderAdder& operator=(const IntersectionFinderAdder& rhs) = delete;
};
} // namespace geos.noding
diff --git a/include/geos/noding/MCIndexNoder.h b/include/geos/noding/MCIndexNoder.h
index 25ebcfa..f0fd48d 100644
--- a/include/geos/noding/MCIndexNoder.h
+++ b/include/geos/noding/MCIndexNoder.h
@@ -109,8 +109,8 @@ public:
SegmentIntersector& si;
// Declare type as noncopyable
- SegmentOverlapAction(const SegmentOverlapAction& other);
- SegmentOverlapAction& operator=(const SegmentOverlapAction& rhs);
+ SegmentOverlapAction(const SegmentOverlapAction& other) = delete;
+ SegmentOverlapAction& operator=(const SegmentOverlapAction& rhs) = delete;
};
};
diff --git a/include/geos/noding/MCIndexSegmentSetMutualIntersector.h b/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
index 24318df..07329af 100644
--- a/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
+++ b/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
@@ -84,8 +84,8 @@ public:
SegmentIntersector & si;
// Declare type as noncopyable
- SegmentOverlapAction(const SegmentOverlapAction& other);
- SegmentOverlapAction& operator=(const SegmentOverlapAction& rhs);
+ SegmentOverlapAction(const SegmentOverlapAction& other) = delete;
+ SegmentOverlapAction& operator=(const SegmentOverlapAction& rhs) = delete;
public:
SegmentOverlapAction(SegmentIntersector & si) :
diff --git a/include/geos/noding/NodingValidator.h b/include/geos/noding/NodingValidator.h
index 4198c08..2d161af 100644
--- a/include/geos/noding/NodingValidator.h
+++ b/include/geos/noding/NodingValidator.h
@@ -91,8 +91,8 @@ private:
const geom::Coordinate& p0, const geom::Coordinate& p1) const;
// Declare type as noncopyable
- NodingValidator(const NodingValidator& other);
- NodingValidator& operator=(const NodingValidator& rhs);
+ NodingValidator(const NodingValidator& other) = delete;
+ NodingValidator& operator=(const NodingValidator& rhs) = delete;
public:
diff --git a/include/geos/noding/ScaledNoder.h b/include/geos/noding/ScaledNoder.h
index f46d1a8..52decf0 100644
--- a/include/geos/noding/ScaledNoder.h
+++ b/include/geos/noding/ScaledNoder.h
@@ -117,8 +117,8 @@ private:
mutable std::vector<geom::CoordinateSequence*> newCoordSeq;
// Declare type as noncopyable
- ScaledNoder(const ScaledNoder& other);
- ScaledNoder& operator=(const ScaledNoder& rhs);
+ ScaledNoder(const ScaledNoder& other) = delete;
+ ScaledNoder& operator=(const ScaledNoder& rhs) = delete;
};
} // namespace geos.noding
diff --git a/include/geos/noding/SegmentNode.h b/include/geos/noding/SegmentNode.h
index bc66973..b321c7a 100644
--- a/include/geos/noding/SegmentNode.h
+++ b/include/geos/noding/SegmentNode.h
@@ -51,8 +51,8 @@ private:
bool isInteriorVar;
// Declare type as noncopyable
- SegmentNode(const SegmentNode& other);
- SegmentNode& operator=(const SegmentNode& rhs);
+ SegmentNode(const SegmentNode& other) = delete;
+ SegmentNode& operator=(const SegmentNode& rhs) = delete;
public:
friend std::ostream& operator<< (std::ostream& os, const SegmentNode& n);
diff --git a/include/geos/noding/SegmentNodeList.h b/include/geos/noding/SegmentNodeList.h
index 7036293..872e5ce 100644
--- a/include/geos/noding/SegmentNodeList.h
+++ b/include/geos/noding/SegmentNodeList.h
@@ -109,8 +109,8 @@ private:
size_t& collapsedVertexIndex);
// Declare type as noncopyable
- SegmentNodeList(const SegmentNodeList& other);
- SegmentNodeList& operator=(const SegmentNodeList& rhs);
+ SegmentNodeList(const SegmentNodeList& other) = delete;
+ SegmentNodeList& operator=(const SegmentNodeList& rhs) = delete;
public:
diff --git a/include/geos/noding/SegmentString.h b/include/geos/noding/SegmentString.h
index 5cf63c4..b9f7c84 100644
--- a/include/geos/noding/SegmentString.h
+++ b/include/geos/noding/SegmentString.h
@@ -98,8 +98,8 @@ private:
const void* context;
// Declare type as noncopyable
- SegmentString(const SegmentString& other);
- SegmentString& operator=(const SegmentString& rhs);
+ SegmentString(const SegmentString& other) = delete;
+ SegmentString& operator=(const SegmentString& rhs) = delete;
};
std::ostream& operator<< (std::ostream& os, const SegmentString& ss);
diff --git a/include/geos/noding/SingleInteriorIntersectionFinder.h b/include/geos/noding/SingleInteriorIntersectionFinder.h
index d471fd5..aa93b1f 100644
--- a/include/geos/noding/SingleInteriorIntersectionFinder.h
+++ b/include/geos/noding/SingleInteriorIntersectionFinder.h
@@ -113,8 +113,8 @@ private:
std::vector<geom::Coordinate> intSegments;
// Declare type as noncopyable
- SingleInteriorIntersectionFinder(const SingleInteriorIntersectionFinder& other);
- SingleInteriorIntersectionFinder& operator=(const SingleInteriorIntersectionFinder& rhs);
+ SingleInteriorIntersectionFinder(const SingleInteriorIntersectionFinder& other) = delete;
+ SingleInteriorIntersectionFinder& operator=(const SingleInteriorIntersectionFinder& rhs) = delete;
};
} // namespace geos.noding
diff --git a/include/geos/noding/snapround/HotPixel.h b/include/geos/noding/snapround/HotPixel.h
index 3f613c9..e4b68e0 100644
--- a/include/geos/noding/snapround/HotPixel.h
+++ b/include/geos/noding/snapround/HotPixel.h
@@ -144,8 +144,8 @@ private:
const geom::Coordinate& p1) const;
// Declare type as noncopyable
- HotPixel(const HotPixel& other);
- HotPixel& operator=(const HotPixel& rhs);
+ HotPixel(const HotPixel& other) = delete;
+ HotPixel& operator=(const HotPixel& rhs) = delete;
public:
diff --git a/include/geos/noding/snapround/MCIndexPointSnapper.h b/include/geos/noding/snapround/MCIndexPointSnapper.h
index 527151b..7ca4ceb 100644
--- a/include/geos/noding/snapround/MCIndexPointSnapper.h
+++ b/include/geos/noding/snapround/MCIndexPointSnapper.h
@@ -80,8 +80,8 @@ private:
index::SpatialIndex& index;
// Declare type as noncopyable
- MCIndexPointSnapper(const MCIndexPointSnapper& other);
- MCIndexPointSnapper& operator=(const MCIndexPointSnapper& rhs);
+ MCIndexPointSnapper(const MCIndexPointSnapper& other) = delete;
+ MCIndexPointSnapper& operator=(const MCIndexPointSnapper& rhs) = delete;
};
diff --git a/include/geos/noding/snapround/MCIndexSnapRounder.h b/include/geos/noding/snapround/MCIndexSnapRounder.h
index ca1e6e5..3f9cd03 100644
--- a/include/geos/noding/snapround/MCIndexSnapRounder.h
+++ b/include/geos/noding/snapround/MCIndexSnapRounder.h
@@ -142,8 +142,8 @@ private:
void checkCorrectness(std::vector<SegmentString*>& inputSegmentStrings);
// Declare type as noncopyable
- MCIndexSnapRounder(const MCIndexSnapRounder& other);
- MCIndexSnapRounder& operator=(const MCIndexSnapRounder& rhs);
+ MCIndexSnapRounder(const MCIndexSnapRounder& other) = delete;
+ MCIndexSnapRounder& operator=(const MCIndexSnapRounder& rhs) = delete;
};
} // namespace geos::noding::snapround
diff --git a/include/geos/noding/snapround/SimpleSnapRounder.h b/include/geos/noding/snapround/SimpleSnapRounder.h
index 095b478..e145e84 100644
--- a/include/geos/noding/snapround/SimpleSnapRounder.h
+++ b/include/geos/noding/snapround/SimpleSnapRounder.h
@@ -135,8 +135,8 @@ private:
void computeVertexSnaps(NodedSegmentString* e0, NodedSegmentString* e1);
// Declare type as noncopyable
- SimpleSnapRounder(const SimpleSnapRounder& other);
- SimpleSnapRounder& operator=(const SimpleSnapRounder& rhs);
+ SimpleSnapRounder(const SimpleSnapRounder& other) = delete;
+ SimpleSnapRounder& operator=(const SimpleSnapRounder& rhs) = delete;
};
} // namespace geos::noding::snapround
diff --git a/include/geos/operation/buffer/BufferBuilder.h b/include/geos/operation/buffer/BufferBuilder.h
index f55c7a0..9bcd3ca 100644
--- a/include/geos/operation/buffer/BufferBuilder.h
+++ b/include/geos/operation/buffer/BufferBuilder.h
@@ -235,8 +235,8 @@ private:
geom::Geometry* createEmptyResultGeometry() const;
// Declare type as noncopyable
- BufferBuilder(const BufferBuilder& other);
- BufferBuilder& operator=(const BufferBuilder& rhs);
+ BufferBuilder(const BufferBuilder& other) = delete;
+ BufferBuilder& operator=(const BufferBuilder& rhs) = delete;
};
} // namespace geos::operation::buffer
diff --git a/include/geos/operation/buffer/BufferInputLineSimplifier.h b/include/geos/operation/buffer/BufferInputLineSimplifier.h
index 297e46b..da6934e 100644
--- a/include/geos/operation/buffer/BufferInputLineSimplifier.h
+++ b/include/geos/operation/buffer/BufferInputLineSimplifier.h
@@ -172,8 +172,8 @@ private:
int angleOrientation;
// Declare type as noncopyable
- BufferInputLineSimplifier(const BufferInputLineSimplifier& other);
- BufferInputLineSimplifier& operator=(const BufferInputLineSimplifier& rhs);
+ BufferInputLineSimplifier(const BufferInputLineSimplifier& other) = delete;
+ BufferInputLineSimplifier& operator=(const BufferInputLineSimplifier& rhs) = delete;
};
diff --git a/include/geos/operation/buffer/OffsetCurveBuilder.h b/include/geos/operation/buffer/OffsetCurveBuilder.h
index c8dbe71..52f1d55 100644
--- a/include/geos/operation/buffer/OffsetCurveBuilder.h
+++ b/include/geos/operation/buffer/OffsetCurveBuilder.h
@@ -175,8 +175,8 @@ private:
// Declare type as noncopyable
- OffsetCurveBuilder(const OffsetCurveBuilder& other);
- OffsetCurveBuilder& operator=(const OffsetCurveBuilder& rhs);
+ OffsetCurveBuilder(const OffsetCurveBuilder& other) = delete;
+ OffsetCurveBuilder& operator=(const OffsetCurveBuilder& rhs) = delete;
};
} // namespace geos::operation::buffer
diff --git a/include/geos/operation/buffer/OffsetCurveSetBuilder.h b/include/geos/operation/buffer/OffsetCurveSetBuilder.h
index d52eea6..14ccc3f 100644
--- a/include/geos/operation/buffer/OffsetCurveSetBuilder.h
+++ b/include/geos/operation/buffer/OffsetCurveSetBuilder.h
@@ -170,8 +170,8 @@ private:
double bufferDistance);
// Declare type as noncopyable
- OffsetCurveSetBuilder(const OffsetCurveSetBuilder& other);
- OffsetCurveSetBuilder& operator=(const OffsetCurveSetBuilder& rhs);
+ OffsetCurveSetBuilder(const OffsetCurveSetBuilder& other) = delete;
+ OffsetCurveSetBuilder& operator=(const OffsetCurveSetBuilder& rhs) = delete;
public:
diff --git a/include/geos/operation/overlay/ElevationMatrix.h b/include/geos/operation/overlay/ElevationMatrix.h
index 9e3e52c..02d963e 100644
--- a/include/geos/operation/overlay/ElevationMatrix.h
+++ b/include/geos/operation/overlay/ElevationMatrix.h
@@ -70,8 +70,8 @@ private:
double avgElevation;
// Declare type as noncopyable
- ElevationMatrixFilter(const ElevationMatrixFilter& other);
- ElevationMatrixFilter& operator=(const ElevationMatrixFilter& rhs);
+ ElevationMatrixFilter(const ElevationMatrixFilter& other) = delete;
+ ElevationMatrixFilter& operator=(const ElevationMatrixFilter& rhs) = delete;
};
diff --git a/include/geos/operation/overlay/snap/GeometrySnapper.h b/include/geos/operation/overlay/snap/GeometrySnapper.h
index 4fbe2ae..7b65a67 100644
--- a/include/geos/operation/overlay/snap/GeometrySnapper.h
+++ b/include/geos/operation/overlay/snap/GeometrySnapper.h
@@ -144,8 +144,8 @@ private:
const geom::Geometry& g);
// Declare type as noncopyable
- GeometrySnapper(const GeometrySnapper& other);
- GeometrySnapper& operator=(const GeometrySnapper& rhs);
+ GeometrySnapper(const GeometrySnapper& other) = delete;
+ GeometrySnapper& operator=(const GeometrySnapper& rhs) = delete;
};
diff --git a/include/geos/operation/overlay/snap/LineStringSnapper.h b/include/geos/operation/overlay/snap/LineStringSnapper.h
index d530b23..16d50d1 100644
--- a/include/geos/operation/overlay/snap/LineStringSnapper.h
+++ b/include/geos/operation/overlay/snap/LineStringSnapper.h
@@ -152,8 +152,8 @@ private:
geom::CoordinateList::iterator too_far);
// Declare type as noncopyable
- LineStringSnapper(const LineStringSnapper& other);
- LineStringSnapper& operator=(const LineStringSnapper& rhs);
+ LineStringSnapper(const LineStringSnapper& other) = delete;
+ LineStringSnapper& operator=(const LineStringSnapper& rhs) = delete;
};
diff --git a/include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h b/include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
index 823ac30..fc3f78c 100644
--- a/include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
+++ b/include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h
@@ -101,8 +101,8 @@ private:
const geom::Geometry& geom1;
// Declare type as noncopyable
- SnapIfNeededOverlayOp(const SnapIfNeededOverlayOp& other);
- SnapIfNeededOverlayOp& operator=(const SnapIfNeededOverlayOp& rhs);
+ SnapIfNeededOverlayOp(const SnapIfNeededOverlayOp& other) = delete;
+ SnapIfNeededOverlayOp& operator=(const SnapIfNeededOverlayOp& rhs) = delete;
};
diff --git a/include/geos/operation/overlay/snap/SnapOverlayOp.h b/include/geos/operation/overlay/snap/SnapOverlayOp.h
index 7be8811..4e12434 100644
--- a/include/geos/operation/overlay/snap/SnapOverlayOp.h
+++ b/include/geos/operation/overlay/snap/SnapOverlayOp.h
@@ -125,8 +125,8 @@ private:
std::unique_ptr<precision::CommonBitsRemover> cbr;
// Declare type as noncopyable
- SnapOverlayOp(const SnapOverlayOp& other);
- SnapOverlayOp& operator=(const SnapOverlayOp& rhs);
+ SnapOverlayOp(const SnapOverlayOp& other) = delete;
+ SnapOverlayOp& operator=(const SnapOverlayOp& rhs) = delete;
};
} // namespace geos::operation::overlay::snap
diff --git a/include/geos/operation/overlay/validate/FuzzyPointLocator.h b/include/geos/operation/overlay/validate/FuzzyPointLocator.h
index 7856372..4799bd5 100644
--- a/include/geos/operation/overlay/validate/FuzzyPointLocator.h
+++ b/include/geos/operation/overlay/validate/FuzzyPointLocator.h
@@ -83,8 +83,8 @@ private:
std::unique_ptr<geom::Geometry> extractLineWork(const geom::Geometry& geom);
// Declare type as noncopyable
- FuzzyPointLocator(const FuzzyPointLocator& other);
- FuzzyPointLocator& operator=(const FuzzyPointLocator& rhs);
+ FuzzyPointLocator(const FuzzyPointLocator& other) = delete;
+ FuzzyPointLocator& operator=(const FuzzyPointLocator& rhs) = delete;
};
} // namespace geos::operation::overlay::validate
diff --git a/include/geos/operation/overlay/validate/OffsetPointGenerator.h b/include/geos/operation/overlay/validate/OffsetPointGenerator.h
index 3b1bbf9..e854106 100644
--- a/include/geos/operation/overlay/validate/OffsetPointGenerator.h
+++ b/include/geos/operation/overlay/validate/OffsetPointGenerator.h
@@ -73,8 +73,8 @@ private:
const geom::Coordinate& p1);
// Declare type as noncopyable
- OffsetPointGenerator(const OffsetPointGenerator& other);
- OffsetPointGenerator& operator=(const OffsetPointGenerator& rhs);
+ OffsetPointGenerator(const OffsetPointGenerator& other) = delete;
+ OffsetPointGenerator& operator=(const OffsetPointGenerator& rhs) = delete;
};
} // namespace geos::operation::overlay::validate
diff --git a/include/geos/operation/overlay/validate/OverlayResultValidator.h b/include/geos/operation/overlay/validate/OverlayResultValidator.h
index e7b30e4..a7380b7 100644
--- a/include/geos/operation/overlay/validate/OverlayResultValidator.h
+++ b/include/geos/operation/overlay/validate/OverlayResultValidator.h
@@ -117,8 +117,8 @@ private:
const geom::Geometry& g0, const geom::Geometry& g1);
// Declare type as noncopyable
- OverlayResultValidator(const OverlayResultValidator& other);
- OverlayResultValidator& operator=(const OverlayResultValidator& rhs);
+ OverlayResultValidator(const OverlayResultValidator& other) = delete;
+ OverlayResultValidator& operator=(const OverlayResultValidator& rhs) = delete;
};
} // namespace geos::operation::overlay::validate
diff --git a/include/geos/operation/predicate/RectangleContains.h b/include/geos/operation/predicate/RectangleContains.h
index d5437a7..0cd78d7 100644
--- a/include/geos/operation/predicate/RectangleContains.h
+++ b/include/geos/operation/predicate/RectangleContains.h
@@ -110,8 +110,8 @@ public:
bool contains(const geom::Geometry& geom);
// Declare type as noncopyable
- RectangleContains(const RectangleContains& other);
- RectangleContains& operator=(const RectangleContains& rhs);
+ RectangleContains(const RectangleContains& other) = delete;
+ RectangleContains& operator=(const RectangleContains& rhs) = delete;
};
diff --git a/include/geos/operation/predicate/RectangleIntersects.h b/include/geos/operation/predicate/RectangleIntersects.h
index e5ccd64..772b6d7 100644
--- a/include/geos/operation/predicate/RectangleIntersects.h
+++ b/include/geos/operation/predicate/RectangleIntersects.h
@@ -58,8 +58,8 @@ private:
const geom::Envelope &rectEnv;
// Declare type as noncopyable
- RectangleIntersects(const RectangleIntersects& other);
- RectangleIntersects& operator=(const RectangleIntersects& rhs);
+ RectangleIntersects(const RectangleIntersects& other) = delete;
+ RectangleIntersects& operator=(const RectangleIntersects& rhs) = delete;
public:
diff --git a/include/geos/operation/sharedpaths/SharedPathsOp.h b/include/geos/operation/sharedpaths/SharedPathsOp.h
index 8a6f515..e2d3d14 100644
--- a/include/geos/operation/sharedpaths/SharedPathsOp.h
+++ b/include/geos/operation/sharedpaths/SharedPathsOp.h
@@ -149,8 +149,8 @@ private:
const geom::GeometryFactory& _gf;
// Declare type as noncopyable
- SharedPathsOp(const SharedPathsOp& other);
- SharedPathsOp& operator=(const SharedPathsOp& rhs);
+ SharedPathsOp(const SharedPathsOp& other) = delete;
+ SharedPathsOp& operator=(const SharedPathsOp& rhs) = delete;
};
diff --git a/include/geos/operation/valid/ConnectedInteriorTester.h b/include/geos/operation/valid/ConnectedInteriorTester.h
index 16c0b5d..76a2786 100644
--- a/include/geos/operation/valid/ConnectedInteriorTester.h
+++ b/include/geos/operation/valid/ConnectedInteriorTester.h
@@ -134,8 +134,8 @@ private:
bool hasUnvisitedShellEdge(std::vector<geomgraph::EdgeRing*> *edgeRings);
// Declare type as noncopyable
- ConnectedInteriorTester(const ConnectedInteriorTester& other);
- ConnectedInteriorTester& operator=(const ConnectedInteriorTester& rhs);
+ ConnectedInteriorTester(const ConnectedInteriorTester& other) = delete;
+ ConnectedInteriorTester& operator=(const ConnectedInteriorTester& rhs) = delete;
};
} // namespace geos::operation::valid
diff --git a/include/geos/planargraph/Subgraph.h b/include/geos/planargraph/Subgraph.h
index d4138ac..2d8dd08 100644
--- a/include/geos/planargraph/Subgraph.h
+++ b/include/geos/planargraph/Subgraph.h
@@ -142,8 +142,8 @@ protected:
NodeMap nodeMap;
// Declare type as noncopyable
- Subgraph(const Subgraph& other);
- Subgraph& operator=(const Subgraph& rhs);
+ Subgraph(const Subgraph& other) = delete;
+ Subgraph& operator=(const Subgraph& rhs) = delete;
};
} // namespace geos::planargraph
diff --git a/include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h b/include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
index 01b2380..d77c6b4 100644
--- a/include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
+++ b/include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h
@@ -84,8 +84,8 @@ private:
Subgraph* subgraph);
// Declare type as noncopyable
- ConnectedSubgraphFinder(const ConnectedSubgraphFinder& other);
- ConnectedSubgraphFinder& operator=(const ConnectedSubgraphFinder& rhs);
+ ConnectedSubgraphFinder(const ConnectedSubgraphFinder& other) = delete;
+ ConnectedSubgraphFinder& operator=(const ConnectedSubgraphFinder& rhs) = delete;
};
} // namespace geos::planargraph::algorithm
diff --git a/include/geos/simplify/DouglasPeuckerLineSimplifier.h b/include/geos/simplify/DouglasPeuckerLineSimplifier.h
index e60f197..4bc39d3 100644
--- a/include/geos/simplify/DouglasPeuckerLineSimplifier.h
+++ b/include/geos/simplify/DouglasPeuckerLineSimplifier.h
@@ -88,8 +88,8 @@ private:
void simplifySection(std::size_t i, std::size_t j);
// Declare type as noncopyable
- DouglasPeuckerLineSimplifier(const DouglasPeuckerLineSimplifier& other);
- DouglasPeuckerLineSimplifier& operator=(const DouglasPeuckerLineSimplifier& rhs);
+ DouglasPeuckerLineSimplifier(const DouglasPeuckerLineSimplifier& other) = delete;
+ DouglasPeuckerLineSimplifier& operator=(const DouglasPeuckerLineSimplifier& rhs) = delete;
};
} // namespace geos::simplify
diff --git a/include/geos/util/UniqueCoordinateArrayFilter.h b/include/geos/util/UniqueCoordinateArrayFilter.h
index 4e52bec..b25804f 100644
--- a/include/geos/util/UniqueCoordinateArrayFilter.h
+++ b/include/geos/util/UniqueCoordinateArrayFilter.h
@@ -77,8 +77,8 @@ private:
geom::Coordinate::ConstSet uniqPts; // unique points set
// Declare type as noncopyable
- UniqueCoordinateArrayFilter(const UniqueCoordinateArrayFilter& other);
- UniqueCoordinateArrayFilter& operator=(const UniqueCoordinateArrayFilter& rhs);
+ UniqueCoordinateArrayFilter(const UniqueCoordinateArrayFilter& other) = delete;
+ UniqueCoordinateArrayFilter& operator=(const UniqueCoordinateArrayFilter& rhs) = delete;
};
} // namespace geos::util
diff --git a/src/noding/ScaledNoder.cpp b/src/noding/ScaledNoder.cpp
index e31a820..6e2e84e 100644
--- a/src/noding/ScaledNoder.cpp
+++ b/src/noding/ScaledNoder.cpp
@@ -93,8 +93,8 @@ public:
private:
// Declare type as noncopyable
- Scaler(const Scaler& other);
- Scaler& operator=(const Scaler& rhs);
+ Scaler(const Scaler& other) = delete;
+ Scaler& operator=(const Scaler& rhs) = delete;
};
class ScaledNoder::ReScaler: public geom::CoordinateFilter {
diff --git a/src/noding/snapround/MCIndexPointSnapper.cpp b/src/noding/snapround/MCIndexPointSnapper.cpp
index 281bb70..cf3e050 100644
--- a/src/noding/snapround/MCIndexPointSnapper.cpp
+++ b/src/noding/snapround/MCIndexPointSnapper.cpp
@@ -80,8 +80,8 @@ private:
bool isNodeAddedVar;
// Declare type as noncopyable
- HotPixelSnapAction(const HotPixelSnapAction& other);
- HotPixelSnapAction& operator=(const HotPixelSnapAction& rhs);
+ HotPixelSnapAction(const HotPixelSnapAction& other) = delete;
+ HotPixelSnapAction& operator=(const HotPixelSnapAction& rhs) = delete;
};
class MCIndexPointSnapperVisitor: public ItemVisitor {
diff --git a/src/operation/overlay/OverlayOp.cpp b/src/operation/overlay/OverlayOp.cpp
index 77f8773..94876e2 100644
--- a/src/operation/overlay/OverlayOp.cpp
+++ b/src/operation/overlay/OverlayOp.cpp
@@ -980,8 +980,8 @@ struct PointCoveredByAny: public geom::CoordinateFilter
private:
// Declare type as noncopyable
- PointCoveredByAny(const PointCoveredByAny& other);
- PointCoveredByAny& operator=(const PointCoveredByAny& rhs);
+ PointCoveredByAny(const PointCoveredByAny& other) = delete;
+ PointCoveredByAny& operator=(const PointCoveredByAny& rhs) = delete;
};
void
diff --git a/src/operation/predicate/RectangleIntersects.cpp b/src/operation/predicate/RectangleIntersects.cpp
index 0a159f5..cbb54e8 100644
--- a/src/operation/predicate/RectangleIntersects.cpp
+++ b/src/operation/predicate/RectangleIntersects.cpp
@@ -51,8 +51,8 @@ private:
bool intersectsVar;
// Declare type as noncopyable
- EnvelopeIntersectsVisitor(const EnvelopeIntersectsVisitor& other);
- EnvelopeIntersectsVisitor& operator=(const EnvelopeIntersectsVisitor& rhs);
+ EnvelopeIntersectsVisitor(const EnvelopeIntersectsVisitor& other) = delete;
+ EnvelopeIntersectsVisitor& operator=(const EnvelopeIntersectsVisitor& rhs) = delete;
protected:
diff --git a/src/simplify/TopologyPreservingSimplifier.cpp b/src/simplify/TopologyPreservingSimplifier.cpp
index 4e44706..fc7425e 100644
--- a/src/simplify/TopologyPreservingSimplifier.cpp
+++ b/src/simplify/TopologyPreservingSimplifier.cpp
@@ -217,8 +217,8 @@ private:
LinesMap& linestringMap;
// Declare type as noncopyable
- LineStringMapBuilderFilter(const LineStringMapBuilderFilter& other);
- LineStringMapBuilderFilter& operator=(const LineStringMapBuilderFilter& rhs);
+ LineStringMapBuilderFilter(const LineStringMapBuilderFilter& other) = delete;
+ LineStringMapBuilderFilter& operator=(const LineStringMapBuilderFilter& rhs) = delete;
};
/*public*/
diff --git a/tests/unit/geom/CoordinateTest.cpp b/tests/unit/geom/CoordinateTest.cpp
index 692d03f..07392cf 100644
--- a/tests/unit/geom/CoordinateTest.cpp
+++ b/tests/unit/geom/CoordinateTest.cpp
@@ -26,8 +26,8 @@ namespace tut
{}
private:
// Declare type as noncopyable
- test_coordinate_data(test_coordinate_data const& other);
- test_coordinate_data& operator=(test_coordinate_data const& rhs);
+ test_coordinate_data(test_coordinate_data const& other) = delete;
+ test_coordinate_data& operator=(test_coordinate_data const& rhs) = delete;
};
typedef test_group<test_coordinate_data> group;
diff --git a/tests/unit/geom/GeometryFactoryTest.cpp b/tests/unit/geom/GeometryFactoryTest.cpp
index b69a723..f65487c 100644
--- a/tests/unit/geom/GeometryFactoryTest.cpp
+++ b/tests/unit/geom/GeometryFactoryTest.cpp
@@ -64,8 +64,8 @@ reader_(factory_.get())
{}
private:
// Declare type as noncopyable
- test_geometryfactory_data(const test_geometryfactory_data& other);
- test_geometryfactory_data& operator=(const test_geometryfactory_data& rhs);
+ test_geometryfactory_data(const test_geometryfactory_data& other) = delete;
+ test_geometryfactory_data& operator=(const test_geometryfactory_data& rhs) = delete;
};
typedef test_group<test_geometryfactory_data> group;
diff --git a/tests/unit/geom/IntersectionMatrixTest.cpp b/tests/unit/geom/IntersectionMatrixTest.cpp
index 5cec018..19b5c03 100644
--- a/tests/unit/geom/IntersectionMatrixTest.cpp
+++ b/tests/unit/geom/IntersectionMatrixTest.cpp
@@ -30,8 +30,8 @@ namespace tut
{}
private:
// Declare type as noncopyable
- test_intersectionmatrix_data(const test_intersectionmatrix_data& other);
- test_intersectionmatrix_data& operator=(const test_intersectionmatrix_data& rhs);
+ test_intersectionmatrix_data(const test_intersectionmatrix_data& other) = delete;
+ test_intersectionmatrix_data& operator=(const test_intersectionmatrix_data& rhs) = delete;
};
typedef test_group<test_intersectionmatrix_data> group;
diff --git a/tests/unit/geom/LinearRingTest.cpp b/tests/unit/geom/LinearRingTest.cpp
index 7a7b21f..6404d8f 100644
--- a/tests/unit/geom/LinearRingTest.cpp
+++ b/tests/unit/geom/LinearRingTest.cpp
@@ -66,8 +66,8 @@ namespace tut
private:
// Declare type as noncopyable
- test_linearring_data(const test_linearring_data& other);
- test_linearring_data& operator=(const test_linearring_data& rhs);
+ test_linearring_data(const test_linearring_data& other) = delete;
+ test_linearring_data& operator=(const test_linearring_data& rhs) = delete;
};
typedef test_group<test_linearring_data> group;
diff --git a/tests/unit/geom/MultiPointTest.cpp b/tests/unit/geom/MultiPointTest.cpp
index 8f592f2..0416c80 100644
--- a/tests/unit/geom/MultiPointTest.cpp
+++ b/tests/unit/geom/MultiPointTest.cpp
@@ -54,8 +54,8 @@ namespace tut
private:
// Declare type as noncopyable
- test_multipoint_data(const test_multipoint_data& other);
- test_multipoint_data& operator=(const test_multipoint_data& rhs);
+ test_multipoint_data(const test_multipoint_data& other) = delete;
+ test_multipoint_data& operator=(const test_multipoint_data& rhs) = delete;
};
typedef test_group<test_multipoint_data> group;
diff --git a/tests/unit/geom/PolygonTest.cpp b/tests/unit/geom/PolygonTest.cpp
index 62429af..f63f0cf 100644
--- a/tests/unit/geom/PolygonTest.cpp
+++ b/tests/unit/geom/PolygonTest.cpp
@@ -63,8 +63,8 @@ namespace tut
private:
// Declare type as noncopyable
- test_polygon_data(const test_polygon_data& other);
- test_polygon_data& operator=(const test_polygon_data& rhs);
+ test_polygon_data(const test_polygon_data& other) = delete;
+ test_polygon_data& operator=(const test_polygon_data& rhs) = delete;
};
typedef test_group<test_polygon_data> group;
diff --git a/tests/unit/operation/buffer/BufferBuilderTest.cpp b/tests/unit/operation/buffer/BufferBuilderTest.cpp
index dc65453..bec7228 100644
--- a/tests/unit/operation/buffer/BufferBuilderTest.cpp
+++ b/tests/unit/operation/buffer/BufferBuilderTest.cpp
@@ -45,8 +45,8 @@ namespace tut
}
private:
// noncopyable
- test_bufferbuilder_data(test_bufferbuilder_data const& other);
- test_bufferbuilder_data& operator=(test_bufferbuilder_data const& rhs);
+ test_bufferbuilder_data(test_bufferbuilder_data const& other) = delete;
+ test_bufferbuilder_data& operator=(test_bufferbuilder_data const& rhs) = delete;
};
typedef test_group<test_bufferbuilder_data> group;
diff --git a/tests/unit/operation/buffer/BufferOpTest.cpp b/tests/unit/operation/buffer/BufferOpTest.cpp
index f5c6009..d4ba5ca 100644
--- a/tests/unit/operation/buffer/BufferOpTest.cpp
+++ b/tests/unit/operation/buffer/BufferOpTest.cpp
@@ -43,8 +43,8 @@ namespace tut
}
private:
// noncopyable
- test_bufferop_data(test_bufferop_data const& other);
- test_bufferop_data& operator=(test_bufferop_data const& rhs);
+ test_bufferop_data(test_bufferop_data const& other) = delete;
+ test_bufferop_data& operator=(test_bufferop_data const& rhs) = delete;
};
typedef test_group<test_bufferop_data> group;
diff --git a/tests/unit/operation/buffer/BufferParametersTest.cpp b/tests/unit/operation/buffer/BufferParametersTest.cpp
index dac232e..2272dad 100644
--- a/tests/unit/operation/buffer/BufferParametersTest.cpp
+++ b/tests/unit/operation/buffer/BufferParametersTest.cpp
@@ -24,8 +24,8 @@ namespace tut
private:
// noncopyable
- test_bufferparameters_data(test_bufferparameters_data const& other);
- test_bufferparameters_data& operator=(test_bufferparameters_data const& rhs);
+ test_bufferparameters_data(test_bufferparameters_data const& other) = delete;
+ test_bufferparameters_data& operator=(test_bufferparameters_data const& rhs) = delete;
};
typedef test_group<test_bufferparameters_data> group;
diff --git a/tests/unit/operation/linemerge/LineMergerTest.cpp b/tests/unit/operation/linemerge/LineMergerTest.cpp
index 8f9169a..46e7915 100644
--- a/tests/unit/operation/linemerge/LineMergerTest.cpp
+++ b/tests/unit/operation/linemerge/LineMergerTest.cpp
@@ -133,8 +133,8 @@ namespace tut
private:
// noncopyable
- test_linemerger_data(test_linemerger_data const& other);
- test_linemerger_data& operator=(test_linemerger_data const& rhs);
+ test_linemerger_data(test_linemerger_data const& other) = delete;
+ test_linemerger_data& operator=(test_linemerger_data const& rhs) = delete;
};
typedef test_group<test_linemerger_data> group;
diff --git a/tests/unit/operation/linemerge/LineSequencerTest.cpp b/tests/unit/operation/linemerge/LineSequencerTest.cpp
index 0532540..a8950aa 100644
--- a/tests/unit/operation/linemerge/LineSequencerTest.cpp
+++ b/tests/unit/operation/linemerge/LineSequencerTest.cpp
@@ -102,8 +102,8 @@ namespace tut
private:
// noncopyable
- test_linesequencer_data(test_linesequencer_data const& other);
- test_linesequencer_data& operator=(test_linesequencer_data const& rhs);
+ test_linesequencer_data(test_linesequencer_data const& other) = delete;
+ test_linesequencer_data& operator=(test_linesequencer_data const& rhs) = delete;
};
typedef test_group<test_linesequencer_data> group;
diff --git a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
index 20ef98e..82647ba 100644
--- a/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
+++ b/tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp
@@ -44,8 +44,8 @@ namespace tut
private:
// noncopyable
- test_shpathop_data(test_shpathop_data const& other);
- test_shpathop_data& operator=(test_shpathop_data const& rhs);
+ test_shpathop_data(test_shpathop_data const& other) = delete;
+ test_shpathop_data& operator=(test_shpathop_data const& rhs) = delete;
};
typedef test_group<test_shpathop_data> group;
-----------------------------------------------------------------------
Summary of changes:
include/geos/algorithm/ConvexHull.inl | 6 +++---
include/geos/algorithm/RayCrossingCounter.h | 4 ++--
include/geos/algorithm/distance/DiscreteFrechetDistance.h | 4 ++--
include/geos/algorithm/distance/DiscreteHausdorffDistance.h | 4 ++--
include/geos/algorithm/locate/IndexedPointInAreaLocator.h | 4 ++--
include/geos/geom/prep/PreparedLineStringIntersects.h | 4 ++--
include/geos/geom/prep/PreparedPolygonPredicate.h | 4 ++--
include/geos/geom/util/ComponentCoordinateExtracter.h | 4 ++--
include/geos/geom/util/GeometryCombiner.h | 4 ++--
include/geos/geom/util/GeometryExtracter.h | 4 ++--
include/geos/geom/util/GeometryTransformer.h | 4 ++--
include/geos/geom/util/LinearComponentExtracter.h | 4 ++--
include/geos/geom/util/PointExtracter.h | 4 ++--
include/geos/geom/util/PolygonExtracter.h | 4 ++--
include/geos/geomgraph/GeometryGraph.h | 4 ++--
include/geos/geomgraph/NodeMap.h | 4 ++--
include/geos/index/chain/MonotoneChain.h | 4 ++--
include/geos/io/StringTokenizer.h | 4 ++--
include/geos/io/WKBReader.h | 4 ++--
include/geos/linearref/LinearIterator.h | 4 ++--
include/geos/noding/FastNodingValidator.h | 4 ++--
include/geos/noding/IntersectionAdder.h | 4 ++--
include/geos/noding/IntersectionFinderAdder.h | 4 ++--
include/geos/noding/MCIndexNoder.h | 4 ++--
include/geos/noding/MCIndexSegmentSetMutualIntersector.h | 4 ++--
include/geos/noding/NodingValidator.h | 4 ++--
include/geos/noding/ScaledNoder.h | 4 ++--
include/geos/noding/SegmentNode.h | 4 ++--
include/geos/noding/SegmentNodeList.h | 4 ++--
include/geos/noding/SegmentString.h | 4 ++--
include/geos/noding/SingleInteriorIntersectionFinder.h | 4 ++--
include/geos/noding/snapround/HotPixel.h | 4 ++--
include/geos/noding/snapround/MCIndexPointSnapper.h | 4 ++--
include/geos/noding/snapround/MCIndexSnapRounder.h | 4 ++--
include/geos/noding/snapround/SimpleSnapRounder.h | 4 ++--
include/geos/operation/buffer/BufferBuilder.h | 4 ++--
include/geos/operation/buffer/BufferInputLineSimplifier.h | 4 ++--
include/geos/operation/buffer/OffsetCurveBuilder.h | 4 ++--
include/geos/operation/buffer/OffsetCurveSetBuilder.h | 4 ++--
include/geos/operation/overlay/ElevationMatrix.h | 4 ++--
include/geos/operation/overlay/snap/GeometrySnapper.h | 4 ++--
include/geos/operation/overlay/snap/LineStringSnapper.h | 4 ++--
include/geos/operation/overlay/snap/SnapIfNeededOverlayOp.h | 4 ++--
include/geos/operation/overlay/snap/SnapOverlayOp.h | 4 ++--
include/geos/operation/overlay/validate/FuzzyPointLocator.h | 4 ++--
include/geos/operation/overlay/validate/OffsetPointGenerator.h | 4 ++--
include/geos/operation/overlay/validate/OverlayResultValidator.h | 4 ++--
include/geos/operation/predicate/RectangleContains.h | 4 ++--
include/geos/operation/predicate/RectangleIntersects.h | 4 ++--
include/geos/operation/sharedpaths/SharedPathsOp.h | 4 ++--
include/geos/operation/valid/ConnectedInteriorTester.h | 4 ++--
include/geos/planargraph/Subgraph.h | 4 ++--
include/geos/planargraph/algorithm/ConnectedSubgraphFinder.h | 4 ++--
include/geos/simplify/DouglasPeuckerLineSimplifier.h | 4 ++--
include/geos/util/UniqueCoordinateArrayFilter.h | 4 ++--
src/noding/ScaledNoder.cpp | 4 ++--
src/noding/snapround/MCIndexPointSnapper.cpp | 4 ++--
src/operation/overlay/OverlayOp.cpp | 4 ++--
src/operation/predicate/RectangleIntersects.cpp | 4 ++--
src/simplify/TopologyPreservingSimplifier.cpp | 4 ++--
tests/unit/geom/CoordinateTest.cpp | 4 ++--
tests/unit/geom/GeometryFactoryTest.cpp | 4 ++--
tests/unit/geom/IntersectionMatrixTest.cpp | 4 ++--
tests/unit/geom/LinearRingTest.cpp | 4 ++--
tests/unit/geom/MultiPointTest.cpp | 4 ++--
tests/unit/geom/PolygonTest.cpp | 4 ++--
tests/unit/operation/buffer/BufferBuilderTest.cpp | 4 ++--
tests/unit/operation/buffer/BufferOpTest.cpp | 4 ++--
tests/unit/operation/buffer/BufferParametersTest.cpp | 4 ++--
tests/unit/operation/linemerge/LineMergerTest.cpp | 4 ++--
tests/unit/operation/linemerge/LineSequencerTest.cpp | 4 ++--
tests/unit/operation/sharedpaths/SharedPathsOpTest.cpp | 4 ++--
72 files changed, 145 insertions(+), 145 deletions(-)
hooks/post-receive
--
geos
More information about the geos-commits
mailing list