summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-18 19:02:47 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-18 19:02:47 (GMT)
commit4d554c391b664f3296ce04b70d9045226beb413c (patch)
treef449a8c6b28250a36bebd77ea1169b88046b8f16 /googlemock
parentb4cbf531e9200f1731e43b299e2c341f2eecbef7 (diff)
downloadgoogletest-4d554c391b664f3296ce04b70d9045226beb413c.zip
googletest-4d554c391b664f3296ce04b70d9045226beb413c.tar.gz
googletest-4d554c391b664f3296ce04b70d9045226beb413c.tar.bz2
typo
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-matchers_test.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index a7bed48..72dff85 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -902,6 +902,8 @@ TEST(SafeMatcherCastTest, FromSameType) {
EXPECT_FALSE(m2.Matches(1));
}
+#if !defined _MSC_VER
+
namespace convertible_from_any {
TEST(SafeMatcherCastTest, ConversionConstructorIsUsed) {
Matcher<ConvertibleFromAny> m = SafeMatcherCast<ConvertibleFromAny>(1);
@@ -917,6 +919,8 @@ TEST(SafeMatcherCastTest, FromConvertibleFromAny) {
}
} // namespace convertible_from_any
+#endif // !defined _MSC_VER
+
TEST(SafeMatcherCastTest, ValueIsNotCopied) {
int n = 42;
Matcher<IntReferenceWrapper> m = SafeMatcherCast<IntReferenceWrapper>(n);