aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-04-04 22:45:59 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2013-04-04 22:45:59 +0000
commitc10a35a26af06908f9b6e84848dbf96cac66eb61 (patch)
treee9a8a2f2660d938ac174d6477d6a28ca47d3478c
parenta9a59e06dd7cdfe52c988bf065bc156a7ed96a5c (diff)
downloadgoogletest-c10a35a26af06908f9b6e84848dbf96cac66eb61.tar.gz
googletest-c10a35a26af06908f9b6e84848dbf96cac66eb61.tar.bz2
googletest-c10a35a26af06908f9b6e84848dbf96cac66eb61.zip
Fixes some compatibility issues with STLport.
-rw-r--r--test/gmock-spec-builders_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/gmock-spec-builders_test.cc b/test/gmock-spec-builders_test.cc
index 4a333df7..92e7d343 100644
--- a/test/gmock-spec-builders_test.cc
+++ b/test/gmock-spec-builders_test.cc
@@ -1523,14 +1523,14 @@ TEST(ExpectationSetTest, SizeWorks) {
TEST(ExpectationSetTest, IsEnumerable) {
ExpectationSet es;
- EXPECT_THAT(es.begin(), Eq(es.end()));
+ EXPECT_TRUE(es.begin() == es.end());
es += Expectation();
ExpectationSet::const_iterator it = es.begin();
- EXPECT_THAT(it, Ne(es.end()));
+ EXPECT_TRUE(it != es.end());
EXPECT_THAT(*it, Eq(Expectation()));
++it;
- EXPECT_THAT(it, Eq(es.end()));
+ EXPECT_TRUE(it== es.end());
}
// Tests the .After() clause.