diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-19 15:14:17 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-19 15:14:17 (GMT) |
| commit | 7b4ee66f5f8228a40ee6f39844a73ab6e7447db8 (patch) | |
| tree | 67f11bbbeb791a214ff1b949ab4201a8a5b83b58 /googlemock | |
| parent | 62a7c140a72a6eba42ce87b66884c7eb6a8ccb82 (diff) | |
| download | googletest-7b4ee66f5f8228a40ee6f39844a73ab6e7447db8.zip googletest-7b4ee66f5f8228a40ee6f39844a73ab6e7447db8.tar.gz googletest-7b4ee66f5f8228a40ee6f39844a73ab6e7447db8.tar.bz2 | |
reverting just to test
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index eafcaae..37fcbfa 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -764,7 +764,7 @@ TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) { namespace convertible_from_any { // Implicitly convertible from any type. struct ConvertibleFromAny { - ConvertibleFromAny(int a_value) : value(a_value) {} +explicit ConvertibleFromAny(int a_value) : value(a_value) {} template <typename T> ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; |