[geos-commits] r4229 - in branches/3.3: . include/geos

Sandro Santilli strk at kbt.io
Thu Jul 14 09:12:58 PDT 2016


Author: strk
Date: 2016-07-14 09:12:57 -0700 (Thu, 14 Jul 2016)
New Revision: 4229

Modified:
   branches/3.3/NEWS
   branches/3.3/configure.in
   branches/3.3/include/geos/platform.h.in
Log:
Look for isnan in std:: namespace

Fully qualify isnan call when HAVE_ISNAN is defined
Tested with gcc 4.8.4

Fixes build with GCC-5.3.0 and higher.
Closes #784

Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2016-07-14 16:12:49 UTC (rev 4228)
+++ branches/3.3/NEWS	2016-07-14 16:12:57 UTC (rev 4229)
@@ -4,6 +4,7 @@
 - Bug fixes / improvements
     - Throw a ParseException on missing chars from HEXWKB string (#675)
     - Fix Empty to Empty equals (#703)
+    - Fix build against GCC 3.5.0+ (#784)
 
 Changes in 3.3.9
 2013-09-04

Modified: branches/3.3/configure.in
===================================================================
--- branches/3.3/configure.in	2016-07-14 16:12:49 UTC (rev 4228)
+++ branches/3.3/configure.in	2016-07-14 16:12:57 UTC (rev 4229)
@@ -199,7 +199,7 @@
 AC_LANG_PUSH([C++])
 AC_CACHE_CHECK([for isnan], ac_cv_isnan,
  [AC_TRY_LINK([#include <cmath>],
- [double x; int y; y = isnan(x);],
+ [double x; int y; y = std::isnan(x);],
  ac_cv_isnan=yes,
  ac_cv_isnan=no
 )])

Modified: branches/3.3/include/geos/platform.h.in
===================================================================
--- branches/3.3/include/geos/platform.h.in	2016-07-14 16:12:49 UTC (rev 4228)
+++ branches/3.3/include/geos/platform.h.in	2016-07-14 16:12:57 UTC (rev 4229)
@@ -84,7 +84,7 @@
 #endif
 
 #if defined(HAVE_ISNAN)
-# define ISNAN(x) (isnan(x))
+# define ISNAN(x) (std::isnan(x))
 #else
 # if defined(_MSC_VER)
 #  define ISNAN(x) _isnan(x)



More information about the geos-commits mailing list