[Cmake-commits] CMake branch, next, updated. v3.0.0-3852-g2f05401

[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  2f0540127b797a08d2b5b95fe1fb95bbe19a76f7 (commit)
       via  96bb902a4006caf513971bd17233b54f14b2e996 (commit)
      from  44208e0bb0b4ddc6caefa4978b4c44aa90932e3d (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=2f0540127b797a08d2b5b95fe1fb95bbe19a76f7
commit 2f0540127b797a08d2b5b95fe1fb95bbe19a76f7
Merge: 44208e0 96bb902
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 23 09:59:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 23 09:59:07 2014 -0400

    Merge topic 'gfortran-compressed-modules' into next
    
    96bb902a cmDependsFortran: Avoid 'void*' to bool conversion warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96bb902a4006caf513971bd17233b54f14b2e996
commit 96bb902a4006caf513971bd17233b54f14b2e996
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 23 09:58:44 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 23 09:58:44 2014 -0400

    cmDependsFortran: Avoid 'void*' to bool conversion warning
    
    Convert istream& to bool explicitly with "?:" to avoid a conversion
    warning from MS compilers.

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 157a52f..e4a146c 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -829,7 +829,7 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
     // but also do not include a date so we can fall through to
     // compare them without skipping any prefix.
     unsigned char hdr[2];
-    bool okay = finModFile.read(reinterpret_cast<char*>(hdr), 2);
+    bool okay = finModFile.read(reinterpret_cast<char*>(hdr), 2)? true:false;
     finModFile.seekg(0);
     if(!(okay && hdr[0] == 0x1f && hdr[1] == 0x8b))
       {

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

Summary of changes:
 Source/cmDependsFortran.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake