[Cmake-commits] CMake branch, next, updated. v2.8.8-2652-g3fb09c9
Brad King
brad.king at kitware.com
Thu Apr 19 14:28:53 EDT 2012
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 3fb09c93100104797ff60f4cbc1ca10fe4754612 (commit)
via b3c77889e43176547b37d392451171acd7860650 (commit)
from 949724ae67778eff539a1f745b4444a7b8528a19 (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=3fb09c93100104797ff60f4cbc1ca10fe4754612
commit 3fb09c93100104797ff60f4cbc1ca10fe4754612
Merge: 949724a b3c7788
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 19 14:28:51 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 19 14:28:51 2012 -0400
Merge topic 'compile-XL-v6' into next
b3c7788 Workaround IBM XL v6 streams seekg bug (#13149)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3c77889e43176547b37d392451171acd7860650
commit b3c77889e43176547b37d392451171acd7860650
Author: Jim Hague <jim.hague at acm.org>
AuthorDate: Thu Apr 19 14:25:55 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 19 14:27:43 2012 -0400
Workaround IBM XL v6 streams seekg bug (#13149)
It seems that file.seekg(0) will, in some circumstances, cause the next
file.getline() to omit the first character it reads. Workaround the
bug by seeking from ios::beg explicitly.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 3f14fa1..d69431e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -300,7 +300,7 @@ bool cmFileCommand::HandleReadCommand(std::vector<std::string> const& args)
offset = atoi(offsetArg.GetCString());
}
- file.seekg(offset);
+ file.seekg(offset, std::ios::beg); // explicit ios::beg for IBM VisualAge 6
std::string output;
-----------------------------------------------------------------------
Summary of changes:
Source/cmFileCommand.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list