diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 13:45:07 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 13:45:07 (GMT) |
| commit | b2d81b4fb2a229d01655afabec9679197cc2c1f4 (patch) | |
| tree | b0122484157fc0f70a87bb5a78582a09c42fe863 /googlemock/test | |
| parent | 07f3bdd4c93dd556d08eba8de3a17cfcbe5cd132 (diff) | |
| download | googletest-b2d81b4fb2a229d01655afabec9679197cc2c1f4.zip googletest-b2d81b4fb2a229d01655afabec9679197cc2c1f4.tar.gz googletest-b2d81b4fb2a229d01655afabec9679197cc2c1f4.tar.bz2 | |
merge, ... gmock-matchers test
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 4f7d0ec..0e40df3 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -61,7 +61,7 @@ // Disable MSVC2015 warning for std::pair: // "decorated name length exceeded, name was truncated". -#if defined(_MSC_VER) && (_MSC_VER == 1900) +#if defined(_MSC_VER) && (_MSC_VER <= 1900) # pragma warning(push) # pragma warning(disable:4503) #endif @@ -761,7 +761,7 @@ namespace convertible_from_any { struct ConvertibleFromAny { ConvertibleFromAny(int a_value) : value(a_value) {} template <typename T> - explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { + ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; @@ -6696,7 +6696,7 @@ TEST(NotTest, WorksOnMoveOnlyType) { } // namespace gmock_matchers_test } // namespace testing -#if defined(_MSC_VER) && (_MSC_VER == 1900) +#if defined(_MSC_VER) && (_MSC_VER <= 1900) # pragma warning(pop) #endif |