From 4707c0ffd4385e7195170a427e4a0471bb5335a6 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Wed, 18 Apr 2018 10:36:12 -0400
Subject: 193353312

---
 googlemock/include/gmock/gmock-matchers.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'googlemock/include/gmock/gmock-matchers.h')

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
-- 
cgit v1.2.3