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 0c47c2f90796aab40911b3595870801bae6ba7d7 (commit)
via 8c308e7ee5061e6b68c8694f618696a72042640c (commit)
from aa373eb723dc596e8b129a6b2f279df27f6d3dda (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=0c47c2f90796aab40911b3595870801bae6ba7d7
commit 0c47c2f90796aab40911b3595870801bae6ba7d7
Merge: aa373eb 8c308e7
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Aug 4 21:49:11 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Aug 4 21:49:11 2014 -0400
Merge topic 'file-strings-encoding' into next
8c308e7e cmFileCommand: Fix compile warnings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c308e7ee5061e6b68c8694f618696a72042640c
commit 8c308e7ee5061e6b68c8694f618696a72042640c
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Aug 4 19:48:35 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Aug 4 19:48:35 2014 -0600
cmFileCommand: Fix compile warnings.
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index d55c44b..1325cec 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -666,7 +666,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
c = fin.get();
if(!fin || (c & 0xC0) != 0x80)
{
- fin.putback(c);
+ fin.putback(static_cast<char>(c));
break;
}
}
@@ -680,7 +680,7 @@ bool
cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
for(unsigned int j=0; j<current_str.size()-1; j++)
{
c = current_str[current_str.size() - 1 - j];
- fin.putback(c);
+ fin.putback(static_cast<char>(c));
}
current_str = "";
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmFileCommand.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
