[geos-commits] [SCM] GEOS branch master updated. 4075390d72d384a8474d5d3e60c91bfb445c1753

[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  4075390d72d384a8474d5d3e60c91bfb445c1753 (commit)
      from  8b0f5862761ac62c3437be8b96286728068754d4 (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 4075390d72d384a8474d5d3e60c91bfb445c1753
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu Jun 20 16:05:11 2019 -0400

    Remove commented-out code

diff --git a/src/geom/Geometry.cpp b/src/geom/Geometry.cpp
index 823a11f..aa99659 100644
--- a/src/geom/Geometry.cpp
+++ b/src/geom/Geometry.cpp
@@ -154,8 +154,7 @@ Geometry::isWithinDistance(const Geometry* geom, double cDistance) const
     const Envelope* env0 = getEnvelopeInternal();
     const Envelope* env1 = geom->getEnvelopeInternal();
     double envDist = env0->distance(env1);
-    //delete env0;
-    //delete env1;
+
     if(envDist > cDistance) {
         return false;
     }
@@ -242,7 +241,6 @@ Geometry::geometryChanged()
 void
 Geometry::geometryChangedAction()
 {
-    //delete envelope;
     envelope.reset(nullptr);
 }
 
diff --git a/src/geom/LineString.cpp b/src/geom/LineString.cpp
index be5e22d..c40a1ee 100644
--- a/src/geom/LineString.cpp
+++ b/src/geom/LineString.cpp
@@ -104,10 +104,7 @@ LineString::LineString(CoordinateSequence::Ptr newCoords,
 }
 
 
-LineString::~LineString()
-{
-    //delete points;
-}
+LineString::~LineString() = default;
 
 std::unique_ptr<CoordinateSequence>
 LineString::getCoordinates() const
diff --git a/src/geomgraph/Depth.cpp b/src/geomgraph/Depth.cpp
index a9bd7d2..0e67a9c 100644
--- a/src/geomgraph/Depth.cpp
+++ b/src/geomgraph/Depth.cpp
@@ -55,10 +55,7 @@ Depth::Depth()
     }
 }
 
-Depth::~Depth()
-{
-//	delete[] &depth;
-}
+Depth::~Depth() = default;
 
 int
 Depth::getDepth(int geomIndex, int posIndex) const
diff --git a/src/geomgraph/index/SimpleMCSweepLineIntersector.cpp b/src/geomgraph/index/SimpleMCSweepLineIntersector.cpp
index c11fd27..f97938a 100644
--- a/src/geomgraph/index/SimpleMCSweepLineIntersector.cpp
+++ b/src/geomgraph/index/SimpleMCSweepLineIntersector.cpp
@@ -30,7 +30,6 @@ namespace geomgraph { // geos.geomgraph
 namespace index { // geos.geomgraph.index
 
 SimpleMCSweepLineIntersector::SimpleMCSweepLineIntersector()
-//events(new vector<SweepLineEvent*>())
 {
 }
 
@@ -42,7 +41,6 @@ SimpleMCSweepLineIntersector::~SimpleMCSweepLineIntersector()
             delete sle;
         }
     }
-    //delete events;
 }
 
 void
diff --git a/src/geomgraph/index/SimpleSweepLineIntersector.cpp b/src/geomgraph/index/SimpleSweepLineIntersector.cpp
index c2972fe..bd8eea6 100644
--- a/src/geomgraph/index/SimpleSweepLineIntersector.cpp
+++ b/src/geomgraph/index/SimpleSweepLineIntersector.cpp
@@ -40,7 +40,6 @@ SimpleSweepLineIntersector::~SimpleSweepLineIntersector()
     for(unsigned int i = 0; i < events.size(); ++i) {
         delete events[i];
     }
-    //delete events;
 }
 
 void
diff --git a/src/index/sweepline/SweepLineIndex.cpp b/src/index/sweepline/SweepLineIndex.cpp
index 6dabf8e..cccbc3b 100644
--- a/src/index/sweepline/SweepLineIndex.cpp
+++ b/src/index/sweepline/SweepLineIndex.cpp
@@ -31,14 +31,9 @@ SweepLineIndex::SweepLineIndex()
     indexBuilt(false),
     nOverlaps(0)
 {
-    //events=new vector<SweepLineEvent*>();
-    //nOverlaps=0;
 }
 
-SweepLineIndex::~SweepLineIndex()
-{
-    //delete events;
-}
+SweepLineIndex::~SweepLineIndex() = default;
 
 void
 SweepLineIndex::add(SweepLineInterval* sweepInt)
diff --git a/src/operation/buffer/OffsetCurveSetBuilder.cpp b/src/operation/buffer/OffsetCurveSetBuilder.cpp
index bbc50b3..56f59c0 100644
--- a/src/operation/buffer/OffsetCurveSetBuilder.cpp
+++ b/src/operation/buffer/OffsetCurveSetBuilder.cpp
@@ -191,7 +191,6 @@ OffsetCurveSetBuilder::addPoint(const Point* p)
     curveBuilder.getLineCurve(coord, distance, lineList);
 
     addCurves(lineList, Location::EXTERIOR, Location::INTERIOR);
-    //delete lineList;
 }
 
 /*private*/
diff --git a/src/operation/overlay/OverlayOp.cpp b/src/operation/overlay/OverlayOp.cpp
index 13361a1..c7debee 100644
--- a/src/operation/overlay/OverlayOp.cpp
+++ b/src/operation/overlay/OverlayOp.cpp
@@ -172,7 +172,6 @@ OverlayOp::OverlayOp(const Geometry* g0, const Geometry* g1)
 
 OverlayOp::~OverlayOp()
 {
-    //delete edgeList;
     delete resultPolyList;
     delete resultLineList;
     delete resultPointList;
diff --git a/src/operation/valid/IndexedNestedRingTester.cpp b/src/operation/valid/IndexedNestedRingTester.cpp
index ee33478..26f7ea4 100644
--- a/src/operation/valid/IndexedNestedRingTester.cpp
+++ b/src/operation/valid/IndexedNestedRingTester.cpp
@@ -98,7 +98,6 @@ IndexedNestedRingTester::isNonNested()
 IndexedNestedRingTester::~IndexedNestedRingTester()
 {
     delete index;
-    //delete totalEnv;
 }
 
 void
diff --git a/src/operation/valid/QuadtreeNestedRingTester.cpp b/src/operation/valid/QuadtreeNestedRingTester.cpp
index ecad166..2f8706b 100644
--- a/src/operation/valid/QuadtreeNestedRingTester.cpp
+++ b/src/operation/valid/QuadtreeNestedRingTester.cpp
@@ -49,8 +49,6 @@ QuadtreeNestedRingTester::QuadtreeNestedRingTester(GeometryGraph* newGraph):
 
 QuadtreeNestedRingTester::~QuadtreeNestedRingTester()
 {
-    //delete rings;
-    //delete totalEnv;
     delete qt;
 }
 

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

Summary of changes:
 src/geom/Geometry.cpp                                | 4 +---
 src/geom/LineString.cpp                              | 5 +----
 src/geomgraph/Depth.cpp                              | 5 +----
 src/geomgraph/index/SimpleMCSweepLineIntersector.cpp | 2 --
 src/geomgraph/index/SimpleSweepLineIntersector.cpp   | 1 -
 src/index/sweepline/SweepLineIndex.cpp               | 7 +------
 src/operation/buffer/OffsetCurveSetBuilder.cpp       | 1 -
 src/operation/overlay/OverlayOp.cpp                  | 1 -
 src/operation/valid/IndexedNestedRingTester.cpp      | 1 -
 src/operation/valid/QuadtreeNestedRingTester.cpp     | 2 --
 10 files changed, 4 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
GEOS