[geos-commits] [SCM] GEOS branch master updated. 7b90ad43631f53174b4e8113ccbc2b51c9dbb2d7

[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  7b90ad43631f53174b4e8113ccbc2b51c9dbb2d7 (commit)
      from  f19efd2be378b158654b70202b8022d3e5df9384 (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 7b90ad43631f53174b4e8113ccbc2b51c9dbb2d7
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Dec 18 15:31:04 2018 -0800

    Remove base 'using namespace' call in header

diff --git a/include/geos/noding/SegmentIntersectionDetector.h b/include/geos/noding/SegmentIntersectionDetector.h
index 8b7eab8..1957dbd 100644
--- a/include/geos/noding/SegmentIntersectionDetector.h
+++ b/include/geos/noding/SegmentIntersectionDetector.h
@@ -23,8 +23,6 @@
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/noding/SegmentString.h>
 
-using namespace geos::algorithm;
-
 namespace geos {
 namespace noding { // geos::noding
 
@@ -44,7 +42,7 @@ namespace noding { // geos::noding
 class SegmentIntersectionDetector : public SegmentIntersector
 {
 private:
-	LineIntersector * li;
+	algorithm::LineIntersector * li;
 
 	bool findProper;
 	bool findAllTypes;
@@ -58,7 +56,7 @@ private:
 
 protected:
 public:
-	SegmentIntersectionDetector( LineIntersector * p_li)
+	SegmentIntersectionDetector( algorithm::LineIntersector * p_li)
 		:
 		li( p_li),
 		findProper(false),
diff --git a/src/noding/FastSegmentSetIntersectionFinder.cpp b/src/noding/FastSegmentSetIntersectionFinder.cpp
index b254f8d..37c313f 100644
--- a/src/noding/FastSegmentSetIntersectionFinder.cpp
+++ b/src/noding/FastSegmentSetIntersectionFinder.cpp
@@ -40,7 +40,7 @@ namespace noding { // geos::noding
 FastSegmentSetIntersectionFinder::
 FastSegmentSetIntersectionFinder( noding::SegmentString::ConstVect * baseSegStrings)
 :	segSetMutInt( new MCIndexSegmentSetMutualIntersector()),
-	lineIntersector( new LineIntersector())
+	lineIntersector( new algorithm::LineIntersector())
 {
 	segSetMutInt->setBaseSegments( baseSegStrings);
 }

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

Summary of changes:
 include/geos/noding/SegmentIntersectionDetector.h | 6 ++----
 src/noding/FastSegmentSetIntersectionFinder.cpp   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GEOS