[Cmake-commits] CMake branch, next, updated. v2.8.4-1542-ga7fe2ed
Brad King
brad.king at kitware.com
Mon May 16 11:56:41 EDT 2011
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 a7fe2ed5bc6a4c961cee186970d4e215beef9a3d (commit)
via c9174c0e4b3605895ff15a2c4102dfdfec011c8c (commit)
from 32f8140a535b0c11aebf6fbc60fdefe75988ddc1 (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=a7fe2ed5bc6a4c961cee186970d4e215beef9a3d
commit a7fe2ed5bc6a4c961cee186970d4e215beef9a3d
Merge: 32f8140 c9174c0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 11:56:40 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 16 11:56:40 2011 -0400
Merge topic 'output-compile-lines' into next
c9174c0 Fix signed/unsigned comparison in EscapeJSON
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9174c0e4b3605895ff15a2c4102dfdfec011c8c
commit c9174c0e4b3605895ff15a2c4102dfdfec011c8c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon May 16 11:55:56 2011 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon May 16 11:55:56 2011 -0400
Fix signed/unsigned comparison in EscapeJSON
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 54f2b03..c6dbdb1 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -142,7 +142,7 @@ void cmGlobalUnixMakefileGenerator3
//----------------------------------------------------------------------------
std::string EscapeJSON(const std::string& s) {
std::string result;
- for (int i = 0; i < s.size(); ++i) {
+ for (std::string::size_type i = 0; i < s.size(); ++i) {
if (s[i] == '"' || s[i] == '\\') {
result += '\\';
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalUnixMakefileGenerator3.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list