Skip to content

Commit 6d5239c

Browse files
authoredMar 15, 2017
Merge pull request #1267 from mockingbirdnest/Cardano
Convergence
2 parents c489076 + c6dc50e commit 6d5239c

File tree

87 files changed

+4339
-4626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+4339
-4626
lines changed
 

‎base/container_iterator.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class IteratorOn final {
2121

2222
Iterator const& iterator() const;
2323

24+
std::int64_t distance_from_begin() const;
25+
2426
private:
2527
not_null<Container*> container_;
2628
Iterator iterator_;

‎base/container_iterator_body.hpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,20 @@ IteratorOn<Container>::IteratorOn(not_null<Container*> container,
1212
: container_(container),
1313
iterator_(iterator) {}
1414

15+
template<typename Container>
16+
template<typename>
17+
IteratorOn<Container> IteratorOn<Container>::Erase() const {
18+
return IteratorOn(container_, container_->erase(iterator_));
19+
}
20+
1521
template<typename Container>
1622
typename Container::iterator const& IteratorOn<Container>::iterator() const {
1723
return iterator_;
1824
}
1925

2026
template<typename Container>
21-
template<typename>
22-
IteratorOn<Container> IteratorOn<Container>::Erase() const {
23-
return IteratorOn(container_, container_->erase(iterator_));
27+
std::int64_t IteratorOn<Container>::distance_from_begin() const {
28+
return std::distance(container_->begin(), iterator_);
2429
}
2530

2631
} // namespace base

0 commit comments

Comments
 (0)
Please sign in to comment.