[geos-commits] [SCM] geos branch master updated. 049ae7afb895f78f64d98a782256b9d05e064393

git at osgeo.org git at osgeo.org
Tue Jul 18 02:34:33 PDT 2017


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  049ae7afb895f78f64d98a782256b9d05e064393 (commit)
      from  f73910622e826b12e24fb31c7378ef8a08c07268 (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 049ae7afb895f78f64d98a782256b9d05e064393
Author: Tamas Szekeres <szekerest at gmail.com>
Date:   Tue Jul 18 11:00:37 2017 +0200

    Fix build error with MSVC

diff --git a/include/geos/geom/Envelope.h b/include/geos/geom/Envelope.h
index 25900e1..32a410d 100644
--- a/include/geos/geom/Envelope.h
+++ b/include/geos/geom/Envelope.h
@@ -32,6 +32,11 @@
 namespace geos {
 namespace geom { // geos::geom
 
+class Envelope;
+
+/// Output operator
+GEOS_DLL std::ostream& operator<< (std::ostream& os, const Envelope& o);
+
 class Coordinate;
 
 /**
@@ -55,7 +60,7 @@ class GEOS_DLL Envelope {
 
 public:
 
-	friend std::ostream& operator<< (std::ostream& os, const Envelope& cl);
+	friend std::ostream& operator<< (std::ostream& os, const Envelope& o);
 
 	typedef std::auto_ptr<Envelope> AutoPtr;
 
@@ -493,9 +498,6 @@ private:
 /// Checks if two Envelopes are equal (2D only check)
 GEOS_DLL bool operator==(const Envelope& a, const Envelope& b);
 
-/// Output operator
-GEOS_DLL std::ostream& operator<< (std::ostream& os, const Envelope& o);
-
 } // namespace geos::geom
 } // namespace geos
 

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

Summary of changes:
 include/geos/geom/Envelope.h |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
geos


More information about the geos-commits mailing list