diff --git a/src/ripple/ledger/ReadView.h b/src/ripple/ledger/ReadView.h index a2b6f6f99..74fac105a 100644 --- a/src/ripple/ledger/ReadView.h +++ b/src/ripple/ledger/ReadView.h @@ -204,7 +204,7 @@ public: explicit sles_type(ReadView const& view); iterator begin() const; - iterator const& + iterator end() const; iterator upper_bound(key_type const& key) const; @@ -217,7 +217,7 @@ public: empty() const; iterator begin() const; - iterator const& + iterator end() const; }; diff --git a/src/ripple/ledger/detail/ReadViewFwdRange.h b/src/ripple/ledger/detail/ReadViewFwdRange.h index c37eab214..5b743678f 100644 --- a/src/ripple/ledger/detail/ReadViewFwdRange.h +++ b/src/ripple/ledger/detail/ReadViewFwdRange.h @@ -147,7 +147,6 @@ public: protected: ReadView const* view_; - boost::optional mutable end_; }; } // namespace detail diff --git a/src/ripple/ledger/impl/ReadView.cpp b/src/ripple/ledger/impl/ReadView.cpp index 69349e1df..96192e792 100644 --- a/src/ripple/ledger/impl/ReadView.cpp +++ b/src/ripple/ledger/impl/ReadView.cpp @@ -135,11 +135,9 @@ ReadView::sles_type::begin() const -> iterator } auto -ReadView::sles_type::end() const -> iterator const& +ReadView::sles_type::end() const -> iterator { - if (!end_) - end_ = iterator(view_, view_->slesEnd()); - return *end_; + return iterator(view_, view_->slesEnd()); } auto @@ -165,11 +163,9 @@ ReadView::txs_type::begin() const -> iterator } auto -ReadView::txs_type::end() const -> iterator const& +ReadView::txs_type::end() const -> iterator { - if (!end_) - end_ = iterator(view_, view_->txsEnd()); - return *end_; + return iterator(view_, view_->txsEnd()); } } // namespace ripple