[geos-commits] [SCM] geos branch master updated. a7b5e81c6a8ff7c790388a60fb43f27a04a41ce5

[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  a7b5e81c6a8ff7c790388a60fb43f27a04a41ce5 (commit)
      from  281e59fc983f724b7a220531d4ea72f78fc7e5dd (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 a7b5e81c6a8ff7c790388a60fb43f27a04a41ce5
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jul 11 15:32:39 2017 +0200

    Move CBR_BEFORE_SNAPPING macro on top of the file

diff --git a/include/geos/geom/BinaryOp.h b/include/geos/geom/BinaryOp.h
index 98f3d91..eba5b8b 100644
--- a/include/geos/geom/BinaryOp.h
+++ b/include/geos/geom/BinaryOp.h
@@ -152,6 +152,12 @@
 # define USE_SNAPPING_POLICY 1
 #endif
 
+/* Remove common bits before snapping */
+#ifndef CBR_BEFORE_SNAPPING
+# define CBR_BEFORE_SNAPPING 1
+#endif
+
+
 /*
  * Check validity of result from SnapOp
  */
@@ -267,8 +273,6 @@ SnapOp(const Geometry* g0, const Geometry *g1, BinOp _Op)
 {
 	typedef std::auto_ptr<Geometry> GeomPtr;
 
-#define CBR_BEFORE_SNAPPING 1
-
 	//using geos::precision::GeometrySnapper;
 	using geos::operation::overlay::snap::GeometrySnapper;
 
@@ -372,7 +376,7 @@ BinaryOp(const Geometry* g0, const Geometry *g1, BinOp _Op)
 	check_valid(*g0, "Input geom 0", true, true);
 	check_valid(*g1, "Input geom 1", true, true);
 
-#ifdef USE_COMMONBITS_POLICY
+#if USE_COMMONBITS_POLICY
 	// Try removing common bits (possibly obsoleted by snapping below)
 	//
 	// NOTE: this policy was _later_ implemented

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

Summary of changes:
 include/geos/geom/BinaryOp.h |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
geos