diff options
| author | kosak <kosak@google.com> | 2014-11-17 01:47:54 +0000 |
|---|---|---|
| committer | kosak <kosak@google.com> | 2014-11-17 01:47:54 +0000 |
| commit | 506340a66b7814b741b4b4a032ca4b059086f1bb (patch) | |
| tree | 2be6603b2f5817a7b57897ecf2bf8231b6eb3b58 /test | |
| parent | d370f85b0236b9d4ee9be91b4ae812f6bf6bb0dd (diff) | |
| download | googletest-506340a66b7814b741b4b4a032ca4b059086f1bb.tar.gz googletest-506340a66b7814b741b4b4a032ca4b059086f1bb.tar.bz2 googletest-506340a66b7814b741b4b4a032ca4b059086f1bb.zip | |
Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gmock-matchers_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index c5476223..cb588470 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -607,11 +607,11 @@ TEST(MatcherCastTest, FromSameType) { EXPECT_FALSE(m2.Matches(1)); } -// Implicitly convertible form any type. +// Implicitly convertible from any type. struct ConvertibleFromAny { ConvertibleFromAny(int a_value) : value(a_value) {} template <typename T> - ConvertibleFromAny(const T& a_value) : value(-1) { + ConvertibleFromAny(const T& /*a_value*/) : value(-1) { ADD_FAILURE() << "Conversion constructor called"; } int value; |