[Cmake-commits] CMake branch, next, updated. v3.1.0-1826-g122cef7

[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  122cef7ce4290f4163d56215babf7eafa5142249 (commit)
       via  137288283063480d7c29ce7d5127a258ad9a67c7 (commit)
       via  25f91c6450f1bc569465af9183bc9ff58f1a503f (commit)
      from  87c968015515351aacbee47779194e1df43b512e (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=122cef7ce4290f4163d56215babf7eafa5142249
commit 122cef7ce4290f4163d56215babf7eafa5142249
Merge: 87c9680 1372882
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 11:51:50 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 13 11:51:50 2015 -0500

    Merge topic 'cdash_upload_file_mode' into next
    
    13728828 jsoncpp: Fix use of isfinite on ancient Linux
    25f91c64 jsoncpp: Add missing <iosfwd> include in json/writer.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=137288283063480d7c29ce7d5127a258ad9a67c7
commit 137288283063480d7c29ce7d5127a258ad9a67c7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 11:51:33 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 13 11:51:33 2015 -0500

    jsoncpp: Fix use of isfinite on ancient Linux

diff --git a/Utilities/cmjsoncpp/json_writer.cpp b/Utilities/cmjsoncpp/json_writer.cpp
index 8eb7dc5..387fd35 100644
--- a/Utilities/cmjsoncpp/json_writer.cpp
+++ b/Utilities/cmjsoncpp/json_writer.cpp
@@ -21,6 +21,13 @@
 #define snprintf _snprintf
 #endif
 
+// Ancient Linux
+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 2
+# if !defined(isfinite)
+#  define isfinite __finite
+# endif
+#endif
+
 #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
 // Disable warning about strdup being deprecated.
 #pragma warning(disable : 4996)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25f91c6450f1bc569465af9183bc9ff58f1a503f
commit 25f91c6450f1bc569465af9183bc9ff58f1a503f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 11:50:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 13 11:51:00 2015 -0500

    jsoncpp: Add missing <iosfwd> include in json/writer.h
    
    The header uses std::ostream, so it must be declared.

diff --git a/Utilities/cmjsoncpp/json/writer.h b/Utilities/cmjsoncpp/json/writer.h
index dc9e46f..397bf6a 100644
--- a/Utilities/cmjsoncpp/json/writer.h
+++ b/Utilities/cmjsoncpp/json/writer.h
@@ -9,6 +9,7 @@
 #if !defined(JSON_IS_AMALGAMATION)
 #include "value.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
+#include <iosfwd>
 #include <vector>
 #include <string>
 

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

Summary of changes:
 Utilities/cmjsoncpp/json/writer.h   |    1 +
 Utilities/cmjsoncpp/json_writer.cpp |    7 +++++++
 2 files changed, 8 insertions(+)


hooks/post-receive
-- 
CMake