diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-06-23 00:14:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 00:14:46 +0000 |
| commit | 7c19550e66162442c1341e60578996f92dccf8ec (patch) | |
| tree | 0b3e0e19187eb95809ef26ab246923a36c5eddbf /runtime/stride_iterator.h | |
| parent | bad9c7b7f88689133cae59d9ccae231822a2020c (diff) | |
| parent | 6e80460bdf0aa9bd273d4a4d665d679c651b5f4f (diff) | |
| download | art-7c19550e66162442c1341e60578996f92dccf8ec.zip art-7c19550e66162442c1341e60578996f92dccf8ec.tar.gz art-7c19550e66162442c1341e60578996f92dccf8ec.tar.bz2 | |
Merge "Fix another miranda method moving GC bug" into mnc-dev
Diffstat (limited to 'runtime/stride_iterator.h')
| -rw-r--r-- | runtime/stride_iterator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/stride_iterator.h b/runtime/stride_iterator.h index 5971524..bd622f3 100644 --- a/runtime/stride_iterator.h +++ b/runtime/stride_iterator.h @@ -22,7 +22,7 @@ namespace art { template<typename T> -class StrideIterator : public std::iterator<std::random_access_iterator_tag, T> { +class StrideIterator : public std::iterator<std::forward_iterator_tag, T> { public: StrideIterator(const StrideIterator&) = default; StrideIterator(StrideIterator&&) = default; @@ -62,7 +62,7 @@ class StrideIterator : public std::iterator<std::random_access_iterator_tag, T> private: uintptr_t ptr_; - const size_t stride_; + size_t stride_; }; } // namespace art |