[geos-commits] [SCM] GEOS branch svn-3.6 updated. d137633afbfc407efc7c8ca24ac65b0051693f99

[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, svn-3.6 has been updated
       via  d137633afbfc407efc7c8ca24ac65b0051693f99 (commit)
      from  641e12a63752c97fdeed93b9975ebebdaaa51932 (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 d137633afbfc407efc7c8ca24ac65b0051693f99
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jan 28 12:23:41 2019 -0800

    Remove use of nullptr

diff --git a/src/operation/overlay/PolygonBuilder.cpp b/src/operation/overlay/PolygonBuilder.cpp
index 957f3dd..224ce45 100644
--- a/src/operation/overlay/PolygonBuilder.cpp
+++ b/src/operation/overlay/PolygonBuilder.cpp
@@ -332,7 +332,7 @@ PolygonBuilder::findEdgeRingContaining(EdgeRing *testEr,
 	LinearRing *testRing = testEr->getLinearRing();
 	const Envelope *testEnv = testRing->getEnvelopeInternal();
 	EdgeRing *minShell = NULL;
-	const Envelope *minShellEnv = nullptr;
+	const Envelope *minShellEnv = NULL;
 
 	for(size_t i = 0, n = newShellList.size(); i<n; i++) {
 		EdgeRing *tryShell = newShellList[i];
@@ -354,11 +354,11 @@ PolygonBuilder::findEdgeRingContaining(EdgeRing *testEr,
 		// check if this new containing ring is smaller than
 		// the current minimum ring
 		if (isContained) {
-			if (minShell==nullptr ||
-			    minShellEnv->contains(tryShellEnv)) {
+			if (minShell==NULL ||
+				minShellEnv->contains(tryShellEnv)) {
 				minShell = tryShell;
 				minShellEnv = minShell->getLinearRing()->getEnvelopeInternal();
-            }
+			}
 		}
 	}
 	return minShell;

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

Summary of changes:
 src/operation/overlay/PolygonBuilder.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS