[Cmake-commits] CMake branch, next, updated. v3.3.1-2901-ge9b1715

[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  e9b171516ce17f0c8eb2dc964b8997ff1f4e5b30 (commit)
       via  75644dafe54c21902f14cfe58cb8338b553b69d8 (commit)
      from  6e4c9000aa52c0b8140e612cb27fb4e4fc6ac82c (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=e9b171516ce17f0c8eb2dc964b8997ff1f4e5b30
commit e9b171516ce17f0c8eb2dc964b8997ff1f4e5b30
Merge: 6e4c900 75644da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 14 09:41:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 14 09:41:49 2015 -0400

    Merge topic 'jsoncpp-portability' into next
    
    75644daf jsoncpp: Fix compilation as C99 on Solaris


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75644dafe54c21902f14cfe58cb8338b553b69d8
commit 75644dafe54c21902f14cfe58cb8338b553b69d8
Author:     Joerg Sonnenberger <joerg at bec.de>
AuthorDate: Sat Sep 12 16:34:12 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 14 09:40:38 2015 -0400

    jsoncpp: Fix compilation as C99 on Solaris
    
    In C99 mode, Solaris variants may already define isfinite, so check for
    the existence first.

diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
index b64cdb0..e3f4e53 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
@@ -24,7 +24,9 @@
 // Solaris
 #if defined(__sun)
 # include <ieeefp.h>
-# define isfinite finite
+# if !defined(isfinite)
+#  define isfinite finite
+# endif
 #endif
 
 // AIX

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

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


hooks/post-receive
-- 
CMake