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

[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  aae36582e743505c863c5767e5989da48f84d5a6 (commit)
      from  3818e56d78dde30c1849341eabe67a5b809b74e2 (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 aae36582e743505c863c5767e5989da48f84d5a6
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Oct 4 12:11:23 2017 +0200

    Emit a warning at compile time about C++ API being unstable
    
    Aware users can remove the warning by defining macro
    USE_UNSTABLE_GEOS_CPP_API
    
    See discussion
    https://lists.osgeo.org/pipermail/geos-devel/2017-October/008054.html

diff --git a/configure.ac b/configure.ac
index f68060a..8d2caa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,10 @@ AM_MAINTAINER_MODE
 AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h])
 AC_PROG_CC
 
+
+dnl Hush warnings
+AC_DEFINE(USE_UNSTABLE_GEOS_CPP_API, [1], [We know])
+
 dnl use libtool ----------------------------------------------------------
 AC_LIBTOOL_DLOPEN
 AC_LIBTOOL_WIN32_DLL
@@ -162,7 +166,8 @@ AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_wno
 NUMERICFLAGS=""
 AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], [])
 
-DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}"
+HUSHWARNING="-DUSE_UNSTABLE_GEOS_CPP_API"
+DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS} ${HUSHWARNING}"
 
 AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
 AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
diff --git a/include/geos/geom/Geometry.h b/include/geos/geom/Geometry.h
index 4deb2e5..0163248 100644
--- a/include/geos/geom/Geometry.h
+++ b/include/geos/geom/Geometry.h
@@ -21,6 +21,11 @@
 #ifndef GEOS_GEOM_GEOMETRY_H
 #define GEOS_GEOM_GEOMETRY_H
 
+#ifndef USE_UNSTABLE_GEOS_CPP_API
+# warning "The GEOS C++ API is unstable, please use the C API instead"
+# warning "HINT: #include geos_c.h"
+#endif
+
 #include <geos/export.h>
 #include <geos/platform.h>
 #include <geos/inline.h>
diff --git a/tests/xmltester/Makefile.am b/tests/xmltester/Makefile.am
index 37928b0..b631260 100644
--- a/tests/xmltester/Makefile.am
+++ b/tests/xmltester/Makefile.am
@@ -136,10 +136,6 @@ XMLTester_SOURCES = \
 
 XMLTester_LDADD = $(LIBS)
 
-# Intentionally drop -ansi -pedantic
-# See http://trac.osgeo.org/geos/ticket/319
-XMLTester_CXXFLAGS = $(INLINE_FLAGS)
-
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
 

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

Summary of changes:
 configure.ac                 |    7 ++++++-
 include/geos/geom/Geometry.h |    5 +++++
 tests/xmltester/Makefile.am  |    4 ----
 3 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
geos