Skip to content

GitLab

Commit b2d81b4f authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files 

merge, ... gmock-matchers test
parent 07f3bdd4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
googlemock/test/gmock-matchers_test.cc
View file @ b2d81b4f
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment