[geos-commits] [SCM] GEOS branch master updated. af3141b9978e615c1b3df9bbfb863e9493ab2b31

[git at osgeo.org]

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  af3141b9978e615c1b3df9bbfb863e9493ab2b31 (commit)
      from  bd37b5ae1aa2e963e76c229d879465837c6bf0da (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 af3141b9978e615c1b3df9bbfb863e9493ab2b31
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Wed Jan 30 09:44:26 2019 -0800

    Disable copy constructors on classes using vector<std::unique_ptr<>>
    to get MSVC (appveyor) compilation back on track

diff --git a/include/geos/index/chain/MonotoneChainBuilder.h b/include/geos/index/chain/MonotoneChainBuilder.h
index 8ac9060..d5e752e 100644
--- a/include/geos/index/chain/MonotoneChainBuilder.h
+++ b/include/geos/index/chain/MonotoneChainBuilder.h
@@ -85,6 +85,14 @@ public:
 	static void getChainStartIndices(const geom::CoordinateSequence& pts,
 			std::vector<std::size_t>& startIndexList);
 
+    /**
+     * Disable copy construction and assignment. Apparently needed to make this
+     * class compile under MSVC. (See https://stackoverflow.com/q/29565299)
+     */
+     MonotoneChainBuilder(const MonotoneChainBuilder&) = delete;
+     MonotoneChainBuilder& operator=(const MonotoneChainBuilder&) = delete;
+
+
 private:
 
 	/**
diff --git a/include/geos/index/quadtree/Quadtree.h b/include/geos/index/quadtree/Quadtree.h
index 21cca2a..d541e40 100644
--- a/include/geos/index/quadtree/Quadtree.h
+++ b/include/geos/index/quadtree/Quadtree.h
@@ -181,6 +181,13 @@ public:
 
 	std::string toString() const;
 
+    /**
+     * Disable copy construction and assignment. Apparently needed to make this
+     * class compile under MSVC. (See https://stackoverflow.com/q/29565299)
+     */
+     Quadtree(const Quadtree&) = delete;
+     Quadtree& operator=(const Quadtree&) = delete;
+
 };
 
 } // namespace geos::index::quadtree
diff --git a/include/geos/noding/MCIndexSegmentSetMutualIntersector.h b/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
index 05a0c96..d35daca 100644
--- a/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
+++ b/include/geos/noding/MCIndexSegmentSetMutualIntersector.h
@@ -87,6 +87,13 @@ public:
               index::chain::MonotoneChain& mc2, std::size_t start2) override;
     };
 
+    /**
+     * Disable copy construction and assignment. Apparently needed to make this
+     * class compile under MSVC. (See https://stackoverflow.com/q/29565299)
+     */
+     MCIndexSegmentSetMutualIntersector(const MCIndexSegmentSetMutualIntersector&) = delete;
+     MCIndexSegmentSetMutualIntersector& operator=(const MCIndexSegmentSetMutualIntersector&) = delete;
+
 private:
 
 	typedef std::vector<std::unique_ptr<index::chain::MonotoneChain>> MonoChains;
diff --git a/include/geos/simplify/LineSegmentIndex.h b/include/geos/simplify/LineSegmentIndex.h
index d4dce8d..307e9a8 100644
--- a/include/geos/simplify/LineSegmentIndex.h
+++ b/include/geos/simplify/LineSegmentIndex.h
@@ -64,15 +64,19 @@ public:
 	std::unique_ptr< std::vector<geom::LineSegment*> >
 			query(const geom::LineSegment* seg);
 
+
 private:
 
 	index::quadtree::Quadtree index;
 
 	std::vector<std::unique_ptr<geom::Envelope>> newEnvelopes;
 
-	// Copying is turned off
-	LineSegmentIndex(const LineSegmentIndex&);
-	LineSegmentIndex& operator=(const LineSegmentIndex&);
+    /**
+     * Disable copy construction and assignment. Apparently needed to make this
+     * class compile under MSVC. (See https://stackoverflow.com/q/29565299)
+     */
+	LineSegmentIndex(const LineSegmentIndex&) = delete;
+	LineSegmentIndex& operator=(const LineSegmentIndex&) = delete;
 };
 
 } // namespace geos::simplify

-----------------------------------------------------------------------

Summary of changes:
 include/geos/index/chain/MonotoneChainBuilder.h          |  8 ++++++++
 include/geos/index/quadtree/Quadtree.h                   |  7 +++++++
 include/geos/noding/MCIndexSegmentSetMutualIntersector.h |  7 +++++++
 include/geos/simplify/LineSegmentIndex.h                 | 10 +++++++---
 4 files changed, 29 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GEOS