[geos-commits] r4225 - in branches/3.5: . include/geos

[Sandro Santilli]

Author: strk
Date: 2016-07-14 04:06:45 -0700 (Thu, 14 Jul 2016)
New Revision: 4225

Modified:
   branches/3.5/NEWS
   branches/3.5/configure.ac
   branches/3.5/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.5/NEWS
===================================================================
--- branches/3.5/NEWS	2016-07-14 10:38:35 UTC (rev 4224)
+++ branches/3.5/NEWS	2016-07-14 11:06:45 UTC (rev 4225)
@@ -9,6 +9,7 @@
   - Fix memory exhaustion case in isvalid (#757)
   - Fix Windows build with Visual Studio 2008 (#766)
   - Fix incorrect return from prepared multipoint intersects (#764)
+  - Fix build against GCC 3.5.0+ (#784)
 
 Changes in 3.5.0
 2015-08-15

Modified: branches/3.5/configure.ac
===================================================================
--- branches/3.5/configure.ac	2016-07-14 10:38:35 UTC (rev 4224)
+++ branches/3.5/configure.ac	2016-07-14 11:06:45 UTC (rev 4225)
@@ -197,7 +197,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.5/include/geos/platform.h.in
===================================================================
--- branches/3.5/include/geos/platform.h.in	2016-07-14 10:38:35 UTC (rev 4224)
+++ branches/3.5/include/geos/platform.h.in	2016-07-14 11:06:45 UTC (rev 4225)
@@ -86,7 +86,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)