diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-30 20:24:30 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-09-30 20:24:30 +0000 |
| commit | 79643f51ed835bc8c897fb429a9d77a41701d7ad (patch) | |
| tree | d18583543f1ea93977ddb2526f38dbbb601cc7a3 | |
| parent | f3aa4d2934a485d756d5709feb97ea6146fe08d6 (diff) | |
| download | googletest-79643f51ed835bc8c897fb429a9d77a41701d7ad.tar.gz googletest-79643f51ed835bc8c897fb429a9d77a41701d7ad.tar.bz2 googletest-79643f51ed835bc8c897fb429a9d77a41701d7ad.zip | |
Changes gmock's version to 1.4.0. Also fixes a compiler warning.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/gmock-printers_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index d9041388..25ab6f36 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Google C++ Mocking Framework], - [1.2.0], + [1.4.0], [googlemock@googlegroups.com], [gmock]) diff --git a/test/gmock-printers_test.cc b/test/gmock-printers_test.cc index 4b900c57..c72e3d3d 100644 --- a/test/gmock-printers_test.cc +++ b/test/gmock-printers_test.cc @@ -705,7 +705,7 @@ TEST(PrintStlContainerTest, HashMultiSet) { std::vector<int> numbers; for (size_t i = 0; i != result.length(); i++) { if (expected_pattern[i] == 'd') { - ASSERT_TRUE(isdigit(result[i])); + ASSERT_TRUE(isdigit(result[i]) != 0); numbers.push_back(result[i] - '0'); } else { EXPECT_EQ(expected_pattern[i], result[i]) << " where result is " |