merge, explicit, ( should be it)

c56ba73a · Gennadiy Civil · 88311784 · c56ba73a
Commit c56ba73a authored Apr 18, 2018 by Gennadiy Civil
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

googlemock/test/gmock-matchers_test.cc googlemock/test/gmock-matchers_test.cc +1 -1

No files found.
--- 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;