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 6a680df6aad7710c9aca4b01a16567dd3ca9771e (commit)
via d6c2bbcbae15f45aa58f48beaedb8b03714df018 (commit)
from 659c3ac9500c56c2f66302775f2d6a71ba87e943 (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=6a680df6aad7710c9aca4b01a16567dd3ca9771e
commit 6a680df6aad7710c9aca4b01a16567dd3ca9771e
Merge: 659c3ac d6c2bbc
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Dec 23 11:28:06 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Dec 23 11:28:06 2014 -0500
Merge topic 'base64-casts' into next
d6c2bbcb cmCTest: Use size_t for cmsysBase64_Encode return value
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6c2bbcbae15f45aa58f48beaedb8b03714df018
commit d6c2bbcbae15f45aa58f48beaedb8b03714df018
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Dec 23 11:26:55 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Dec 23 11:26:55 2014 -0500
cmCTest: Use size_t for cmsysBase64_Encode return value
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 1a7bf45..b894db9 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1688,7 +1688,7 @@ std::string cmCTest::Base64GzipEncodeFile(std::string
file)
//----------------------------------------------------------------------
std::string cmCTest::Base64EncodeFile(std::string file)
{
- const size_t len = cmSystemTools::FileLength(file);
+ size_t const len = cmSystemTools::FileLength(file);
cmsys::ifstream ifs(file.c_str(), std::ios::in
#ifdef _WIN32
| std::ios::binary
@@ -1701,11 +1701,11 @@ std::string cmCTest::Base64EncodeFile(std::string file)
unsigned char *encoded_buffer
= new unsigned char [ (len * 3) / 2 + 5 ];
- unsigned long rlen
+ size_t const rlen
= cmsysBase64_Encode(file_buffer, len, encoded_buffer, 1);
std::string base64 = "";
- for(unsigned long i = 0; i < rlen; i++)
+ for(size_t i = 0; i < rlen; i++)
{
base64 += encoded_buffer[i];
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmCTest.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
