[geos-commits] [SCM] geos branch warn-on-using-c++-api created. 401c345ad7a9cdc255fa0040e4c97ad9c88b4f76

[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, warn-on-using-c++-api has been created
        at  401c345ad7a9cdc255fa0040e4c97ad9c88b4f76 (commit)

- Log -----------------------------------------------------------------
commit 401c345ad7a9cdc255fa0040e4c97ad9c88b4f76
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
    WE_ACKNOWLEDGE_THAT_THE_GEOS_CPLUSPLUS_API_IS_UNSTABLE
    
    See discussion
    https://lists.osgeo.org/pipermail/geos-devel/2017-October/008054.html

diff --git a/configure.ac b/configure.ac
index f68060a..52cbe61 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(WE_ACKNOWLEDGE_THAT_THE_GEOS_CPLUSPLUS_API_IS_UNSTABLE, [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="-DWE_ACKNOWLEDGE_THAT_THE_GEOS_CPLUSPLUS_API_IS_UNSTABLE"
+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..b2609aa 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 WE_ACKNOWLEDGE_THAT_THE_GEOS_CPLUSPLUS_API_IS_UNSTABLE
+# 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
 

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


hooks/post-receive
-- 
geos