summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-09-30 20:24:30 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-09-30 20:24:30 +0000
commit643d22f67691182b54c5c1f6dcadfdb31c754d9f (patch)
treed18583543f1ea93977ddb2526f38dbbb601cc7a3
parent92561c0e0a80bedcb24a5b166f75c8e7cbcfd203 (diff)
downloadgooglemock-643d22f67691182b54c5c1f6dcadfdb31c754d9f.tar.gz
Changes gmock's version to 1.4.0. Also fixes a compiler warning.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@216 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--configure.ac2
-rw-r--r--test/gmock-printers_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index d904138..25ab6f3 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 4b900c5..c72e3d3 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 "