[Cmake-commits] CMake branch, next, updated. v3.2.1-1329-g3720acd

Brad King brad.king at kitware.com
Tue Mar 31 14:55:58 EDT 2015


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  3720acd7bfebe5f6ab4221162e6d1dae4eb6d19a (commit)
       via  7b1cdb00279908cacabada92f8a53e4986465423 (commit)
      from  6011d83d46a2e74dd96040db5ea1b162aab155e1 (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=3720acd7bfebe5f6ab4221162e6d1dae4eb6d19a
commit 3720acd7bfebe5f6ab4221162e6d1dae4eb6d19a
Merge: 6011d83 7b1cdb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 14:55:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 14:55:57 2015 -0400

    Merge topic 'jsoncpp-isfinite' into next
    
    7b1cdb00 jsoncpp: Provide 'isfinite' implementation on older AIX and HP-UX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7b1cdb00279908cacabada92f8a53e4986465423
commit 7b1cdb00279908cacabada92f8a53e4986465423
Author:     Ådne Hovda <ahovda at openit.com>
AuthorDate: Mon Mar 30 21:32:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 14:55:00 2015 -0400

    jsoncpp: Provide 'isfinite' implementation on older AIX and HP-UX
    
    Newer AIX and HP-UX platforms provide 'isfinite' as a <math.h> macro.
    Older versions do not, so add the definition if it is not provided.

diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
index 7f8e6f1..15222d6 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
@@ -27,6 +27,20 @@
 # define isfinite finite
 #endif
 
+// AIX
+#if defined(_AIX)
+# if !defined(isfinite)
+#  define isfinite finite
+# endif
+#endif
+
+// HP-UX
+#if defined(__hpux)
+# if !defined(isfinite)
+#  define isfinite finite
+# endif
+#endif
+
 // Ancient glibc
 #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 2
 # if !defined(isfinite)

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list