diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-04-04 18:48:06 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-04-04 18:48:06 (GMT) |
| commit | aa14cc42858a7aec2605b27e0a221e9a4dac8921 (patch) | |
| tree | 3dc79270022ca17bdae2e39aeccc6a9f1f93f1a8 /googlemock | |
| parent | 0f790fa5a8c79228dd1cfaf9d1cc75a732233c93 (diff) | |
| download | googletest-aa14cc42858a7aec2605b27e0a221e9a4dac8921.zip googletest-aa14cc42858a7aec2605b27e0a221e9a4dac8921.tar.gz googletest-aa14cc42858a7aec2605b27e0a221e9a4dac8921.tar.bz2 | |
Fixing build break on MSVC
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 cc16134..f2ce8f2 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -696,7 +696,7 @@ TEST(MatcherCastTest, FromSameType) { 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; |