diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-18 11:05:00 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-18 11:05:00 -0400 |
| commit | c56ba73a23e19527d1e0afc40988ce727686bd9e (patch) | |
| tree | ada6cbd7a09d05187ab2aa4c4b91b452755d08df | |
| parent | 88311784e43440456a7acb3d1afd65b36c1f095d (diff) | |
| download | googletest-c56ba73a23e19527d1e0afc40988ce727686bd9e.tar.gz googletest-c56ba73a23e19527d1e0afc40988ce727686bd9e.tar.bz2 googletest-c56ba73a23e19527d1e0afc40988ce727686bd9e.zip | |
merge, explicit, ( should be it)
| -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 8b115cd8..ebb88cc6 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -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; |