diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-04-18 10:57:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 10:57:04 -0400 |
| commit | 4bd8c4638ada823a8da2569735cc0a9402fb8052 (patch) | |
| tree | 26b35dc506e533dd74abfb53b6090c8acd743ad4 /googlemock/include | |
| parent | 4035d6ecc030defa3500f81576b4b83f316413db (diff) | |
| parent | 88311784e43440456a7acb3d1afd65b36c1f095d (diff) | |
| download | googletest-4bd8c4638ada823a8da2569735cc0a9402fb8052.tar.gz googletest-4bd8c4638ada823a8da2569735cc0a9402fb8052.tar.bz2 googletest-4bd8c4638ada823a8da2569735cc0a9402fb8052.zip | |
Merge pull request #1579 from gennadiycivil/master
193353312
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 7c707750..3a2b944e 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -5212,17 +5212,20 @@ internal::AnyOfMatcher<Args...> AnyOf(const Args&... matchers) { } template <typename... Args> -internal::ElementsAreMatcher<tuple<typename std::decay<Args>::type...>> +internal::ElementsAreMatcher<tuple<typename std::decay<const Args&>::type...>> ElementsAre(const Args&... matchers) { return internal::ElementsAreMatcher< - tuple<typename std::decay<Args>::type...>>(make_tuple(matchers...)); + tuple<typename std::decay<const Args&>::type...>>( + make_tuple(matchers...)); } template <typename... Args> -internal::UnorderedElementsAreMatcher<tuple<typename std::decay<Args>::type...>> +internal::UnorderedElementsAreMatcher< + tuple<typename std::decay<const Args&>::type...>> UnorderedElementsAre(const Args&... matchers) { return internal::UnorderedElementsAreMatcher< - tuple<typename std::decay<Args>::type...>>(make_tuple(matchers...)); + tuple<typename std::decay<const Args&>::type...>>( + make_tuple(matchers...)); } #endif // GTEST_LANG_CXX11 |