diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-12 14:28:02 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-12 14:28:02 (GMT) |
| commit | 9b5940e040c9e0f45bb3dfe3ab457d1e6ec022b0 (patch) | |
| tree | 2fdaef689163db9afc1b47e338bc4ad0db83b457 /googlemock | |
| parent | b2d81b4fb2a229d01655afabec9679197cc2c1f4 (diff) | |
| download | googletest-9b5940e040c9e0f45bb3dfe3ab457d1e6ec022b0.zip googletest-9b5940e040c9e0f45bb3dfe3ab457d1e6ec022b0.tar.gz googletest-9b5940e040c9e0f45bb3dfe3ab457d1e6ec022b0.tar.bz2 | |
revert this one
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 0e40df3..3162a05 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> - ConvertibleFromAny(const T& /*a_value*/) : value(-1) { + explicit ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; |