[Cmake-commits] CMake branch, next, updated. v3.3.1-2831-g18a1e12
Brad King
brad.king at kitware.com
Thu Sep 10 09:56:29 EDT 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 18a1e129f5f68ecc33af8a4b7b634d34c95ada91 (commit)
via 92fa6e593a56f74a380286db73a191aa3fbf8548 (commit)
from ed8a460aaec9162ff5185dd5578960392d24cf44 (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=18a1e129f5f68ecc33af8a4b7b634d34c95ada91
commit 18a1e129f5f68ecc33af8a4b7b634d34c95ada91
Merge: ed8a460 92fa6e5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 09:56:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 10 09:56:28 2015 -0400
Merge topic 'fix-TrimWhitespace' into next
92fa6e59 fixup! cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92fa6e593a56f74a380286db73a191aa3fbf8548
commit 92fa6e593a56f74a380286db73a191aa3fbf8548
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Sep 10 09:55:59 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Sep 10 09:55:59 2015 -0400
fixup! cmSystemTools: Fix TrimWhitespace for non-ascii strings (#15735)
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3a84e11..1fe76ef 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -228,13 +228,13 @@ std::string cmSystemTools::HelpFileName(std::string name)
std::string cmSystemTools::TrimWhitespace(const std::string& s)
{
std::string::const_iterator start = s.begin();
- while(start != s.end() && isspace(*start))
+ while (start != s.end() && ((*start & 0x80) == 0 ) && isspace(*start))
++start;
if (start == s.end())
return "";
std::string::const_iterator stop = s.end()-1;
- while(isspace(*stop))
+ while ( ((*start & 0x80) == 0 ) && isspace(*stop))
--stop;
return std::string(start, stop+1);
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmSystemTools.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list