gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Publishes GTEST_HAS_STREAM_REDIRECTION (by Vlad Losev); casts char to unsigned char before calling isspace() etc to avoid undefined behavior (by Zhanyong Wan); fixes the VC projects (by Fredrik Roubert).

Browse Source
This commit is contained in:
zhanyong.wan
2010-08-31 18:28:02 +00:00
parent ccedc1c933
commit 2516f60da9
6 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gmock-internal-utils.cc
View File

@@ -57,14 +57,14 @@ string ConvertIdentifierNameToWords(const char* id_name) {
for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) {
// We don't care about the current locale as the input is
// guaranteed to be a valid C++ identifier name.
const bool starts_new_word = isupper(*p) ||
(!isalpha(prev_char) && islower(*p)) ||
(!isdigit(prev_char) && isdigit(*p));
const bool starts_new_word = IsUpper(*p) ||
(!IsAlpha(prev_char) && IsLower(*p)) ||
(!IsDigit(prev_char) && IsDigit(*p));
if (isalnum(*p)) {
if (IsAlNum(*p)) {
if (starts_new_word && result != "")
result += ' ';
result += static_cast<char>(tolower(*p));
result += ToLower(*p);
}
}
return result;