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

[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  cf5dcbf3036b4db7350c5dd5cc465179fa00ec19 (commit)
       via  01f74e8d2aab41c735b7c5c8534d16b948d098bf (commit)
      from  213c808d8d60e0d032effd1ac308b3144d908925 (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 cf5dcbf3036b4db7350c5dd5cc465179fa00ec19
Merge: 213c808 01f74e8
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu Jun 27 20:34:57 2019 -0400

    Merge remote-tracking branch 'dbaston/fix-cpp17-build'


commit 01f74e8d2aab41c735b7c5c8534d16b948d098bf
Author: Daniel Baston <dbaston at gmail.com>
Date:   Thu Jun 27 16:19:54 2019 -0400

    Remove use of std::mem_fun
    
    It is deprecated in C+11 and removed in C++17.

diff --git a/src/noding/MCIndexNoder.cpp b/src/noding/MCIndexNoder.cpp
index c966f08..74827f1 100644
--- a/src/noding/MCIndexNoder.cpp
+++ b/src/noding/MCIndexNoder.cpp
@@ -48,8 +48,9 @@ MCIndexNoder::computeNodes(SegmentString::NonConstVect* inputSegStrings)
     nodedSegStrings = inputSegStrings;
     assert(nodedSegStrings);
 
-    for_each(nodedSegStrings->begin(), nodedSegStrings->end(),
-             bind1st(mem_fun(&MCIndexNoder::add), this));
+    for (const auto& s : *nodedSegStrings) {
+        add(s);
+    }
 
     intersectChains();
 //cerr<<"MCIndexNoder: # chain overlaps = "<<nOverlaps<<endl;
diff --git a/src/noding/snapround/MCIndexSnapRounder.cpp b/src/noding/snapround/MCIndexSnapRounder.cpp
index 5089caa..4a0e94a 100644
--- a/src/noding/snapround/MCIndexSnapRounder.cpp
+++ b/src/noding/snapround/MCIndexSnapRounder.cpp
@@ -26,8 +26,6 @@
 
 #include <geos/inline.h>
 
-#include <functional> // std::mem_fun, std::bind1st
-#include <algorithm> // std::for_each
 #include <vector>
 
 
diff --git a/src/operation/overlay/OverlayOp.cpp b/src/operation/overlay/OverlayOp.cpp
index c7debee..a708b23 100644
--- a/src/operation/overlay/OverlayOp.cpp
+++ b/src/operation/overlay/OverlayOp.cpp
@@ -47,7 +47,6 @@
 
 #include <cassert>
 #include <cmath>
-#include <functional>
 #include <vector>
 #include <sstream>
 #include <memory> // for unique_ptr
@@ -207,10 +206,6 @@ OverlayOp::insertUniqueEdges(vector<Edge*>* edges, const Envelope* env)
 #endif
         insertUniqueEdge(e);
     }
-    /*
-    	for_each(edges->begin(), edges->end(),
-    			bind1st(mem_fun(&OverlayOp::insertUniqueEdge), this));
-    */
 }
 
 /*private*/
diff --git a/src/operation/overlay/validate/OffsetPointGenerator.cpp b/src/operation/overlay/validate/OffsetPointGenerator.cpp
index b07ca84..7d9c44a 100644
--- a/src/operation/overlay/validate/OffsetPointGenerator.cpp
+++ b/src/operation/overlay/validate/OffsetPointGenerator.cpp
@@ -62,8 +62,10 @@ OffsetPointGenerator::getPoints()
 
     vector<const LineString*> lines;
     geos::geom::util::LinearComponentExtracter::getLines(g, lines);
-    for_each(lines.begin(), lines.end(),
-             bind1st(mem_fun(&OffsetPointGenerator::extractPoints), this));
+
+    for (const auto& line : lines) {
+        extractPoints(line);
+    }
 
     // NOTE: Apparently, this is 'source' method giving up the object resource.
     return std::move(offsetPts);

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

Summary of changes:
 src/noding/MCIndexNoder.cpp                             | 5 +++--
 src/noding/snapround/MCIndexSnapRounder.cpp             | 2 --
 src/operation/overlay/OverlayOp.cpp                     | 5 -----
 src/operation/overlay/validate/OffsetPointGenerator.cpp | 6 ++++--
 4 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS