[Cmake-commits] CMake branch, next, updated. v3.6.2-1933-g975f8c5

[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  975f8c53e326f0afe1981947d1a601fd3696be87 (commit)
       via  73128b823c2fe8f63fcdc4c8c92c3672b6f05f3c (commit)
       via  8f324c7cefea75a12c0f58977177edf263f42e9f (commit)
      from  f0d742bd3d3ef68cb52f17d1819325503557d463 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=975f8c53e326f0afe1981947d1a601fd3696be87
commit 975f8c53e326f0afe1981947d1a601fd3696be87
Merge: f0d742b 73128b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 12 09:29:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 12 09:29:20 2016 -0400

    Merge topic 'clang-tidy' into next
    
    73128b82 cmDependsFortran: simplify boolean expression
    8f324c7c cmSystemTools: simplify boolean expressions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73128b823c2fe8f63fcdc4c8c92c3672b6f05f3c
commit 73128b823c2fe8f63fcdc4c8c92c3672b6f05f3c
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:43:06 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 12 09:28:21 2016 -0400

    cmDependsFortran: simplify boolean expression

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index b7e006d..eb4c1ec 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -712,10 +712,5 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
   // Compare the remaining content.  If no compiler id matched above,
   // including the case none was given, this will compare the whole
   // content.
-  if (!cmFortranStreamsDiffer(finModFile, finStampFile)) {
-    return false;
-  }
-
-  // The modules are different.
-  return true;
+  return cmFortranStreamsDiffer(finModFile, finStampFile);
 }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f324c7cefea75a12c0f58977177edf263f42e9f
commit 8f324c7cefea75a12c0f58977177edf263f42e9f
Author:     Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:41:31 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 12 09:28:21 2016 -0400

    cmSystemTools: simplify boolean expressions

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 7da9975..7352217 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1766,9 +1766,7 @@ bool cmSystemTools::CopyFileTime(const char* fromFile, const char* toFile)
   if (!GetFileTime(hFrom, &timeCreation, &timeLastAccess, &timeLastWrite)) {
     return false;
   }
-  if (!SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite)) {
-    return false;
-  }
+  return SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite) != 0;
 #else
   struct stat fromStat;
   if (stat(fromFile, &fromStat) < 0) {
@@ -1778,11 +1776,8 @@ bool cmSystemTools::CopyFileTime(const char* fromFile, const char* toFile)
   struct utimbuf buf;
   buf.actime = fromStat.st_atime;
   buf.modtime = fromStat.st_mtime;
-  if (utime(toFile, &buf) < 0) {
-    return false;
-  }
+  return utime(toFile, &buf) >= 0;
 #endif
-  return true;
 }
 
 cmSystemToolsFileTime* cmSystemTools::FileTimeNew()
@@ -1828,16 +1823,11 @@ bool cmSystemTools::FileTimeSet(const char* fname, cmSystemToolsFileTime* t)
   if (!h) {
     return false;
   }
-  if (!SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
-                   &t->timeLastWrite)) {
-    return false;
-  }
+  return SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
+                     &t->timeLastWrite) != 0;
 #else
-  if (utime(fname, &t->timeBuf) < 0) {
-    return false;
-  }
+  return utime(fname, &t->timeBuf) >= 0;
 #endif
-  return true;
 }
 
 #ifdef _WIN32

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

Summary of changes:


hooks/post-receive
-- 
CMake