[Cmake-commits] CMake branch, next, updated. v3.2.0-rc2-823-g6e32c9d
Brad King
brad.king at kitware.com
Tue Mar 3 08:34:18 EST 2015
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 6e32c9dc34b4fcb61586e8045777db19bac77b17 (commit)
via b8ea771b13989f353c2762abd40a65b6d33a1eb7 (commit)
from d4bdfa2ed8c9e0011aa42880f263ea41d91a3cba (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=6e32c9dc34b4fcb61586e8045777db19bac77b17
commit 6e32c9dc34b4fcb61586e8045777db19bac77b17
Merge: d4bdfa2 b8ea771
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 3 08:34:17 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 3 08:34:17 2015 -0500
Merge topic 'backport-KWSys-SystemTools-CopyFileAlways-fix' into next
b8ea771b KWSys SystemTools: Update CopyFileAlways stream library workarounds
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ea771b13989f353c2762abd40a65b6d33a1eb7
commit b8ea771b13989f353c2762abd40a65b6d33a1eb7
Author: Paul Martin <paul.martin at codethink.co.uk>
AuthorDate: Fri Feb 27 10:45:26 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 2 08:55:13 2015 -0500
KWSys SystemTools: Update CopyFileAlways stream library workarounds
On some stream libraries failbit is not set when trying to read past
EOF. Instead, always exit the copy loop when gcount() is zero.
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index 2708211..b03e7b0 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -2330,6 +2330,10 @@ bool SystemTools::CopyFileAlways(const kwsys_stl::string& source, const kwsys_st
{
fout.write(buffer, fin.gcount());
}
+ else
+ {
+ break;
+ }
}
// Make sure the operating system has finished writing the file
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list