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

[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  f7867f9e6ff5379a14dd78890925e7ecd1bf22dc (commit)
       via  754c4cd6deb6c9a9c7340756add260b247a13ddc (commit)
      from  33e771633cab9ae248b769b89385b624371545d8 (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 f7867f9e6ff5379a14dd78890925e7ecd1bf22dc
Merge: 33e7716 754c4cd
Author: Daniel Baston <dbaston at gmail.com>
Date:   Wed Sep 19 09:43:06 2018 -0400

    Merge branch 'no-exception-pointers'


commit 754c4cd6deb6c9a9c7340756add260b247a13ddc
Author: Daniel Baston <dbaston at gmail.com>
Date:   Tue Sep 18 11:14:20 2018 -0400

    Avoid throwing exceptions as pointers

diff --git a/src/algorithm/locate/IndexedPointInAreaLocator.cpp b/src/algorithm/locate/IndexedPointInAreaLocator.cpp
index 637767f..d670f55 100644
--- a/src/algorithm/locate/IndexedPointInAreaLocator.cpp
+++ b/src/algorithm/locate/IndexedPointInAreaLocator.cpp
@@ -103,7 +103,7 @@ IndexedPointInAreaLocator::IndexedPointInAreaLocator( const geom::Geometry & g)
 {
 	if (	typeid( areaGeom) != typeid( geom::Polygon)
 		&&	typeid( areaGeom) != typeid( geom::MultiPolygon) )
-		throw new util::IllegalArgumentException("Argument must be Polygonal");
+		throw util::IllegalArgumentException("Argument must be Polygonal");
 
 	//areaGeom = g;
 
diff --git a/src/index/intervalrtree/SortedPackedIntervalRTree.cpp b/src/index/intervalrtree/SortedPackedIntervalRTree.cpp
index eda819b..7df33de 100644
--- a/src/index/intervalrtree/SortedPackedIntervalRTree.cpp
+++ b/src/index/intervalrtree/SortedPackedIntervalRTree.cpp
@@ -129,7 +129,7 @@ void
 SortedPackedIntervalRTree::insert( double min, double max, void * item)
 {
 	if (root != nullptr)
-		throw new util::UnsupportedOperationException( "Index cannot be added to once it has been queried");
+		throw util::UnsupportedOperationException( "Index cannot be added to once it has been queried");
 
 	leaves->push_back( new IntervalRTreeLeafNode( min, max, item));
 }
diff --git a/src/index/strtree/BoundablePair.cpp b/src/index/strtree/BoundablePair.cpp
index 4ec0b7b..8e42d87 100644
--- a/src/index/strtree/BoundablePair.cpp
+++ b/src/index/strtree/BoundablePair.cpp
@@ -97,7 +97,7 @@ void BoundablePair::expandToQueue(BoundablePairQueue & priQ, double minDistance)
 		return;
 	}
 
-	throw new geos::util::IllegalArgumentException("neither boundable is composite");
+	throw geos::util::IllegalArgumentException("neither boundable is composite");
 }
 
 void BoundablePair::expand(const Boundable* bndComposite, const Boundable* bndOther, BoundablePairQueue & priQ, double minDistance) {
diff --git a/src/triangulate/quadedge/QuadEdgeSubdivision.cpp b/src/triangulate/quadedge/QuadEdgeSubdivision.cpp
index 53a4711..219f4e0 100644
--- a/src/triangulate/quadedge/QuadEdgeSubdivision.cpp
+++ b/src/triangulate/quadedge/QuadEdgeSubdivision.cpp
@@ -56,8 +56,7 @@ QuadEdgeSubdivision::getTriangleEdges(const QuadEdge &startQE,
     triEdge[1] = &triEdge[0]->lNext();
     triEdge[2] = &triEdge[1]->lNext();
     if (&triEdge[2]->lNext() != triEdge[0]) {
-        throw new
-            util::IllegalArgumentException("Edges do not form a triangle");
+        throw util::IllegalArgumentException("Edges do not form a triangle");
     }
 }
 

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

Summary of changes:
 src/algorithm/locate/IndexedPointInAreaLocator.cpp    | 2 +-
 src/index/intervalrtree/SortedPackedIntervalRTree.cpp | 2 +-
 src/index/strtree/BoundablePair.cpp                   | 2 +-
 src/triangulate/quadedge/QuadEdgeSubdivision.cpp      | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS