summaryrefslogtreecommitdiffstats
path: root/googlemock/include
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2019-10-10 17:12:54 (GMT)
committerGennadiy Civil <misterg@google.com>2019-10-11 11:06:56 (GMT)
commited78e54f38ab10c775e39e5c4d500c6134a60d64 (patch)
treed911208bec3165eeaaf5a12f48181d25aa7be489 /googlemock/include
parent58c71977611c0019cf077e43fb54bc3326409a43 (diff)
downloadgoogletest-ed78e54f38ab10c775e39e5c4d500c6134a60d64.zip
googletest-ed78e54f38ab10c775e39e5c4d500c6134a60d64.tar.gz
googletest-ed78e54f38ab10c775e39e5c4d500c6134a60d64.tar.bz2
Googletest export
Fix the O(n^2) number of instantiations in ElemFromList. It is now O(n). It still has O(1) instantiation depth. PiperOrigin-RevId: 273980821
Diffstat (limited to 'googlemock/include')
-rw-r--r--googlemock/include/gmock/internal/gmock-internal-utils.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h
index d012e71..584afa9 100644
--- a/googlemock/include/gmock/internal/gmock-internal-utils.h
+++ b/googlemock/include/gmock/internal/gmock-internal-utils.h
@@ -490,8 +490,7 @@ struct Function<R(Args...)> {
using Result = R;
static constexpr size_t ArgumentCount = sizeof...(Args);
template <size_t I>
- using Arg = ElemFromList<I, typename MakeIndexSequence<sizeof...(Args)>::type,
- Args...>;
+ using Arg = ElemFromList<I, Args...>;
using ArgumentTuple = std::tuple<Args...>;
using ArgumentMatcherTuple = std::tuple<Matcher<Args>...>;
using MakeResultVoid = void(Args...);