diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-11-24 20:23:18 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-11-24 20:23:18 +0000 |
| commit | 19eb9e9e3d4d5a4f0eee786d7664ca0e45137390 (patch) | |
| tree | f28c91fcdbbac205124a68b4e5f9641d05288d07 /test/gmock-actions_test.cc | |
| parent | e56daa7de1d85c35d1cdc252b500ab276b5c1c9c (diff) | |
| download | googletest-19eb9e9e3d4d5a4f0eee786d7664ca0e45137390.tar.gz googletest-19eb9e9e3d4d5a4f0eee786d7664ca0e45137390.tar.bz2 googletest-19eb9e9e3d4d5a4f0eee786d7664ca0e45137390.zip | |
Pulls in gtest r344; improves implicit_cast (by Zhanyong Wan); makes the Python tests work on Windows (by Vlad Losev); adds run_tests.py (by Vlad Losev).
Diffstat (limited to 'test/gmock-actions_test.cc')
| -rw-r--r-- | test/gmock-actions_test.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/gmock-actions_test.cc b/test/gmock-actions_test.cc index e2b1d052..1be4a16c 100644 --- a/test/gmock-actions_test.cc +++ b/test/gmock-actions_test.cc @@ -545,9 +545,6 @@ TEST(ReturnTest, ConvertsArgumentWhenConverted) { << "when performed." ; } -// We do not support non-const type conversions on Symbian. See -// definition of implicit_cast in gmock-port.h for more information. -#if !GTEST_OS_SYMBIAN class DestinationType {}; class SourceType { @@ -560,7 +557,6 @@ TEST(ReturnTest, CanConvertArgumentUsingNonConstTypeCastOperator) { SourceType s; Action<DestinationType()> action(Return(s)); } -#endif // !GTEST_OS_SYMBIAN // Tests that ReturnNull() returns NULL in a pointer-returning function. TEST(ReturnNullTest, WorksInPointerReturningFunction) { |