diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-05-22 06:01:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 06:01:05 -0700 |
| commit | 32c84be0fc3a417a938ce93275461f2cf960ef1c (patch) | |
| tree | 1e44c78c0653048fc4847f1ab424f4af7b20e67c /googlemock/test/gmock-matchers_test.cc | |
| parent | f91bf75cf97f70cfc3814bd12cc7d505c62269e2 (diff) | |
| parent | 8276dbae6fb1016cf9829f2e790fade17967a6d4 (diff) | |
| download | googletest-32c84be0fc3a417a938ce93275461f2cf960ef1c.tar.gz googletest-32c84be0fc3a417a938ce93275461f2cf960ef1c.tar.bz2 googletest-32c84be0fc3a417a938ce93275461f2cf960ef1c.zip | |
Merge branch 'master' into unused-variable-fuchsia
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index b4224651..87b2ad5c 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -3704,6 +3704,7 @@ MATCHER_P(FieldIIs, inner_matcher, "") { return ExplainMatchResult(inner_matcher, arg.i, result_listener); } +#if GTEST_HAS_RTTI TEST(WhenDynamicCastToTest, SameType) { Derived derived; derived.i = 4; @@ -3761,12 +3762,8 @@ TEST(WhenDynamicCastToTest, AmbiguousCast) { TEST(WhenDynamicCastToTest, Describe) { Matcher<Base*> matcher = WhenDynamicCastTo<Derived*>(Pointee(_)); -#if GTEST_HAS_RTTI const std::string prefix = "when dynamic_cast to " + internal::GetTypeName<Derived*>() + ", "; -#else // GTEST_HAS_RTTI - const std::string prefix = "when dynamic_cast, "; -#endif // GTEST_HAS_RTTI EXPECT_EQ(prefix + "points to a value that is anything", Describe(matcher)); EXPECT_EQ(prefix + "does not point to a value that is anything", DescribeNegation(matcher)); @@ -3799,6 +3796,7 @@ TEST(WhenDynamicCastToTest, BadReference) { Base& as_base_ref = derived; EXPECT_THAT(as_base_ref, Not(WhenDynamicCastTo<const OtherDerived&>(_))); } +#endif // GTEST_HAS_RTTI // Minimal const-propagating pointer. template <typename T> |