From 2516f60da9073f3b04c0bbfc37d3aefffe11767e Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Tue, 31 Aug 2010 18:28:02 +0000 Subject: 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). --- src/gmock-internal-utils.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index cc51836b..9debe187 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -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(tolower(*p)); + result += ToLower(*p); } } return result; -- cgit v1.2.3