aboutsummaryrefslogtreecommitdiffstats
path: root/test/gmock_test.cc
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-12-02 23:30:50 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2010-12-02 23:30:50 +0000
commita684b5a5269e3f9c53ef842bf9b9658370418a0c (patch)
tree342974398cc8c2d734ea51676db283c40182737c /test/gmock_test.cc
parent88032d8e0f6d4bc63b97aeeab84fdc44aeab1c89 (diff)
downloadgoogletest-a684b5a5269e3f9c53ef842bf9b9658370418a0c.tar.gz
googletest-a684b5a5269e3f9c53ef842bf9b9658370418a0c.tar.bz2
googletest-a684b5a5269e3f9c53ef842bf9b9658370418a0c.zip
Enables SetArgPointee<>() to accept a string literal; removes a self-assignment warning; teaches gmock doctor to diagnose TTB with Clang; picks up gtest r525.
Diffstat (limited to 'test/gmock_test.cc')
-rw-r--r--test/gmock_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/gmock_test.cc b/test/gmock_test.cc
index ba137dd3..0b891137 100644
--- a/test/gmock_test.cc
+++ b/test/gmock_test.cc
@@ -251,5 +251,5 @@ TEST(WideInitGoogleMockTest, CallsInitGoogleTest) {
TEST(FlagTest, IsAccessibleInCode) {
bool dummy = testing::GMOCK_FLAG(catch_leaked_mocks) &&
testing::GMOCK_FLAG(verbose) == "";
- dummy = dummy; // Avoids the "unused local variable" warning.
+ (void)dummy; // Avoids the "unused local variable" warning.
}