Changes gmock's version to 1.4.0. Also fixes a compiler warning.
This commit is contained in:
parent
f3aa4d2934
commit
79643f51ed
@ -1,5 +1,5 @@
|
|||||||
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])
|
||||||
|
|
||||||
|
@ -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 "
|
||||||
|
Loading…
x
Reference in New Issue
Block a user