gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge, ... gmock-matchers test

Browse Source
This commit is contained in:
Gennadiy Civil 2018-04-12 09:45:07 -04:00
parent 07f3bdd4c9
commit b2d81b4fb2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
googlemock/test/gmock-matchers_test.cc
View File

@ -61,7 +61,7 @@
// Disable MSVC2015 warning for std::pair: // Disable MSVC2015 warning for std::pair:
// "decorated name length exceeded, name was truncated". // "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(push)
# pragma warning(disable:4503) # pragma warning(disable:4503)
#endif #endif
@ -761,7 +761,7 @@ namespace convertible_from_any {
struct ConvertibleFromAny { struct ConvertibleFromAny {
ConvertibleFromAny(int a_value) : value(a_value) {} ConvertibleFromAny(int a_value) : value(a_value) {}
template <typename T> template <typename T>
explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ConvertibleFromAny(const T& /*a_value*/) : value(-1) {
ADD_FAILURE() << "Conversion constructor called"; ADD_FAILURE() << "Conversion constructor called";
} }
int value; int value;
@ -6696,7 +6696,7 @@ TEST(NotTest, WorksOnMoveOnlyType) {
} // namespace gmock_matchers_test } // namespace gmock_matchers_test
} // namespace testing } // namespace testing
#if defined(_MSC_VER) && (_MSC_VER == 1900) #if defined(_MSC_VER) && (_MSC_VER <= 1900)
# pragma warning(pop) # pragma warning(pop)
#endif #endif