diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-05 11:59:59 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-05 11:59:59 -0400 |
| commit | 7045138a0d4fdc4c3d0bb582c3def9b3cbea9a26 (patch) | |
| tree | cbcc466b036f6ea7adfce671852f1c4f0dd6867f | |
| parent | 66eaf9f0eb894851f22544297f26aab39fe110d1 (diff) | |
| download | googletest-7045138a0d4fdc4c3d0bb582c3def9b3cbea9a26.tar.gz googletest-7045138a0d4fdc4c3d0bb582c3def9b3cbea9a26.zip | |
Have to wait for this one
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index daac0327..33be41a9 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -758,9 +758,9 @@ TEST(MatcherCastTest, NonImplicitlyConstructibleTypeWithOperatorEq) { namespace convertible_from_any { // Implicitly convertible from any type. struct ConvertibleFromAny { - explicit ConvertibleFromAny(int a_value) : value(a_value) {} + ConvertibleFromAny(int a_value) : value(a_value) {} template <typename T> - ConvertibleFromAny(const T& /*a_value*/) : value(-1) { + explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; |
