[Cmake-commits] CMake branch, next, updated. v3.2.2-3154-g7c11e23

[Brad King]

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 "CMake".

The branch, next has been updated
       via  7c11e23e8b6eabbcdf6f0829e0439c1ec07cf7cb (commit)
       via  9217b678b305d7df7471ba476a81bf28961fdfa3 (commit)
      from  1a8adc58f0654430a5a3851d14da6578fa9cfd25 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c11e23e8b6eabbcdf6f0829e0439c1ec07cf7cb
commit 7c11e23e8b6eabbcdf6f0829e0439c1ec07cf7cb
Merge: 1a8adc5 9217b67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 10:13:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 10:13:09 2015 -0400

    Merge topic 'hpux-isfinite' into next
    
    9217b678 jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9217b678b305d7df7471ba476a81bf28961fdfa3
commit 9217b678b305d7df7471ba476a81bf28961fdfa3
Author:     Michael Scott <michael.scott at gbgplc.com>
AuthorDate: Tue May 26 10:09:45 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 10:12:25 2015 -0400

    jsoncpp: Provide 'isfinite' impl on more HP-UX versions (#15576)
    
    Some versions of HP-UX do not define 'isfinite' or 'finite' in math.h
    for Itanium when preprocessing with C++, so we have to add the
    definition ourselves instead to map to the internal version.

diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
index 15222d6..b64cdb0 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
@@ -37,7 +37,12 @@
 // HP-UX
 #if defined(__hpux)
 # if !defined(isfinite)
-#  define isfinite finite
+#  if defined(__ia64) && !defined(finite)
+#   define isfinite(x) ((sizeof(x) == sizeof(float) ? \
+                        _Isfinitef(x) : _Isfinite(x)))
+#  else
+#   define isfinite finite
+#  endif
 # endif
 #endif
 

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

Summary of changes:
 Utilities/cmjsoncpp/src/lib_json/json_writer.cpp |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake