summaryrefslogtreecommitdiff
path: root/libartbase/base/iteration_range.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2020-11-12 14:12:52 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2020-11-12 16:33:50 +0000
commitfe270426c8a2a69a8f669339e83b86fbf40e25a1 (patch)
treec048fdec8e37cefb7238218a087709c01d5d3923 /libartbase/base/iteration_range.h
parente17530a19a717879c8dd8e70073de6aaf4ee455f (diff)
Revert "Partial LSE analysis & store removal"
This reverts commit bb6cda60e4418c0ab557ea4090e046bed8206763. Bug: 67037140 Reason for revert: memory leak detected in the test. Change-Id: I81cc2f61494e96964d8be40389eddcd7c66c9266
Diffstat (limited to 'libartbase/base/iteration_range.h')
-rw-r--r--libartbase/base/iteration_range.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/libartbase/base/iteration_range.h b/libartbase/base/iteration_range.h
index c916250751..eaed8b06a8 100644
--- a/libartbase/base/iteration_range.h
+++ b/libartbase/base/iteration_range.h
@@ -18,7 +18,6 @@
#define ART_LIBARTBASE_BASE_ITERATION_RANGE_H_
#include <iterator>
-#include <type_traits>
namespace art {
@@ -50,11 +49,9 @@ inline IterationRange<Iter> MakeIterationRange(const Iter& begin_it, const Iter&
return IterationRange<Iter>(begin_it, end_it);
}
-template <typename List>
-inline auto MakeIterationRange(List& list) -> IterationRange<decltype(list.begin())> {
- static_assert(std::is_same_v<decltype(list.begin()), decltype(list.end())>,
- "Different iterator types");
- return MakeIterationRange(list.begin(), list.end());
+template<typename List>
+inline IterationRange<typename List::iterator> MakeIterationRange(List& list) {
+ return IterationRange<typename List::iterator>(list.begin(), list.end());
}
template <typename Iter>