typo

4d554c39 · Gennadiy Civil · b4cbf531 · 4d554c39
Commit 4d554c39 authored Apr 18, 2018 by Gennadiy Civil
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

googlemock/test/gmock-matchers_test.cc googlemock/test/gmock-matchers_test.cc +4 -0

No files found.
--- 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);