[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-990-g4f4eda6

[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  4f4eda6f14a3753c392c0addc99b3d12e89e3b51 (commit)
       via  cf79de9b35c306ee2317c71d14ae8e2a9f7c374e (commit)
      from  81bd110de4e4e6a503ff348bb16af1700ea9c12c (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=4f4eda6f14a3753c392c0addc99b3d12e89e3b51
commit 4f4eda6f14a3753c392c0addc99b3d12e89e3b51
Merge: 81bd110 cf79de9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 10:16:33 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 2 10:16:33 2014 -0500

    Merge topic 'file-LOCK-command' into next
    
    cf79de9b cmFileLock: Fix warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf79de9b35c306ee2317c71d14ae8e2a9f7c374e
commit cf79de9b35c306ee2317c71d14ae8e2a9f7c374e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 2 10:11:00 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 2 10:11:10 2014 -0500

    cmFileLock: Fix warnings

diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx
index f69c36a..5f75637 100644
--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@@ -22,6 +22,7 @@ cmFileLock::~cmFileLock()
   if (!this->Filename.empty())
     {
     const cmFileLockResult result = this->Release();
+    static_cast<void>(result);
     assert(result.IsOk());
     }
 }
diff --git a/Source/cmFileLock.h b/Source/cmFileLock.h
index 7c2803b..4d922a0 100644
--- a/Source/cmFileLock.h
+++ b/Source/cmFileLock.h
@@ -23,7 +23,7 @@ class cmFileLockResult;
 
 /**
   * @brief Cross-platform file locking.
-  * @detail Under the hood this class use 'fcntl' for Unix-like platforms and
+  * @details Under the hood this class use 'fcntl' for Unix-like platforms and
   * 'LockFileEx'/'UnlockFileEx' for Win32 platform. Locks are exclusive and
   * advisory.
   */
@@ -46,7 +46,7 @@ class cmFileLock
 
   /**
     * @brief Check file is locked by this class.
-    * @detail This function helps to find double locks (deadlocks) and to do
+    * @details This function helps to find double locks (deadlocks) and to do
     * explicit unlocks.
     */
   bool IsLocked(const std::string& filename) const;
diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx
index 3c01da8..5b0db69 100644
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@@ -96,7 +96,7 @@ int cmFileLock::LockFile(int cmd, int type)
   lock.l_start = 0;
   lock.l_len = 0; // lock all bytes
   lock.l_pid = 0; // unused (for F_GETLK only)
-  lock.l_type = type; // exclusive lock
+  lock.l_type = static_cast<short>(type); // exclusive lock
   lock.l_whence = SEEK_SET;
   return ::fcntl(this->File, cmd, &lock);
 }

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

Summary of changes:
 Source/cmFileLock.cxx     |    1 +
 Source/cmFileLock.h       |    4 ++--
 Source/cmFileLockUnix.cxx |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake