diff options
| author | duxiuxing <duxiuxing@qq.com> | 2018-07-20 06:16:21 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 06:16:21 +0800 |
| commit | d8db0ca9cf226f37e909982af83845a4cd40800f (patch) | |
| tree | 75f6ec1727b40e525fef203cb7999cdf240a3760 /googlemock/include/gmock/gmock-matchers.h | |
| parent | 2eb43960076417a3dca33ea5ad58e3e9feaee6e4 (diff) | |
| parent | 6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb (diff) | |
| download | googletest-d8db0ca9cf226f37e909982af83845a4cd40800f.tar.gz googletest-d8db0ca9cf226f37e909982af83845a4cd40800f.tar.bz2 googletest-d8db0ca9cf226f37e909982af83845a4cd40800f.zip | |
Merge branch 'master' into googletest_for_asam
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index c94f5826..7fd57870 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -5165,13 +5165,17 @@ std::string DescribeMatcher(const M& matcher, bool negation = false) { // Define variadic matcher versions. They are overloaded in // gmock-generated-matchers.h for the cases supported by pre C++11 compilers. template <typename... Args> -internal::AllOfMatcher<Args...> AllOf(const Args&... matchers) { - return internal::AllOfMatcher<Args...>(matchers...); +internal::AllOfMatcher<typename std::decay<const Args&>::type...> AllOf( + const Args&... matchers) { + return internal::AllOfMatcher<typename std::decay<const Args&>::type...>( + matchers...); } template <typename... Args> -internal::AnyOfMatcher<Args...> AnyOf(const Args&... matchers) { - return internal::AnyOfMatcher<Args...>(matchers...); +internal::AnyOfMatcher<typename std::decay<const Args&>::type...> AnyOf( + const Args&... matchers) { + return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>( + matchers...); } template <typename... Args> |