diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-09-25 21:29:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 21:29:51 -0700 |
| commit | 9241466921b7bd6ae4915923a5d7af55446abfd1 (patch) | |
| tree | b538b286f4c002955bc53847c5fb1a04540346b9 /googlemock/include/gmock/gmock-matchers.h | |
| parent | 5e13fe66222300eef60d7dc37fdcafbb442cc60f (diff) | |
| parent | 0809c68040ab11b906568e8df72019ce2fe0b049 (diff) | |
| download | googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.tar.gz googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.tar.bz2 googletest-9241466921b7bd6ae4915923a5d7af55446abfd1.zip | |
Merge branch 'master' into appveyor-mingw-enable-tests-again
Diffstat (limited to 'googlemock/include/gmock/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index fa26bf9b..b4961d44 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -5170,23 +5170,6 @@ std::string DescribeMatcher(const M& matcher, bool negation = false) { return ss.str(); } -#if GTEST_LANG_CXX11 -// 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<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<typename std::decay<const Args&>::type...> AnyOf( - const Args&... matchers) { - return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>( - matchers...); -} - template <typename... Args> internal::ElementsAreMatcher<tuple<typename std::decay<const Args&>::type...>> ElementsAre(const Args&... matchers) { @@ -5204,6 +5187,23 @@ UnorderedElementsAre(const Args&... matchers) { make_tuple(matchers...)); } +#if GTEST_LANG_CXX11 +// 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<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<typename std::decay<const Args&>::type...> AnyOf( + const Args&... matchers) { + return internal::AnyOfMatcher<typename std::decay<const Args&>::type...>( + matchers...); +} + #endif // GTEST_LANG_CXX11 // AllArgs(m) is a synonym of m. This is useful in |