diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-19 13:31:15 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-19 13:31:15 -0400 |
commit | 6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb (patch) | |
tree | 4e62778f0cf8752eaea7a4ee3ebe8316fe29f91b /googlemock/include/gmock/gmock-matchers.h | |
parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
parent | 61b819721758870d68cc07c07f27cf19004a5e88 (diff) | |
download | googletest-6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb.tar.gz googletest-6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb.tar.bz2 googletest-6ce9b98f541b8bcd84c5c5b3483f29a933c4aefb.zip |
Merge pull request #1674 from gennadiycivil/master
Code Sync
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> |