Skip to content

GitLab

Commit 79643f51 authored by zhanyong.wan's avatar zhanyong.wan
Browse files

Changes gmock's version to 1.4.0. Also fixes a compiler warning.

parent f3aa4d29
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.ac
View file @ 79643f51
AC_INIT([Google C++ Mocking Framework], AC_INIT([Google C++ Mocking Framework],
[1.2.0], [1.4.0],
[googlemock@googlegroups.com], [googlemock@googlegroups.com],
[gmock]) [gmock])
......
test/gmock-printers_test.cc
View file @ 79643f51
...@@ -705,7 +705,7 @@ TEST(PrintStlContainerTest, HashMultiSet) { ...@@ -705,7 +705,7 @@ TEST(PrintStlContainerTest, HashMultiSet) {
std::vector<int> numbers; std::vector<int> numbers;
for (size_t i = 0; i != result.length(); i++) { for (size_t i = 0; i != result.length(); i++) {
if (expected_pattern[i] == 'd') { if (expected_pattern[i] == 'd') {
ASSERT_TRUE(isdigit(result[i])); ASSERT_TRUE(isdigit(result[i]) != 0);
numbers.push_back(result[i] - '0'); numbers.push_back(result[i] - '0');
} else { } else {
EXPECT_EQ(expected_pattern[i], result[i]) << " where result is " EXPECT_EQ(expected_pattern[i], result[i]) << " where result is "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment