From 034620c5212c39dfc0717003d0aa0972686825cd Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 23 Nov 2016 21:06:42 +0100 Subject: [PATCH] graph: fix internal iterator constness * spot/graph/graph.hh: Use only const variants of begin()/end(), since they do not modify the iterator. --- spot/graph/graph.hh | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/spot/graph/graph.hh b/spot/graph/graph.hh index 9201316b4..28df515d7 100644 --- a/spot/graph/graph.hh +++ b/spot/graph/graph.hh @@ -277,24 +277,12 @@ namespace spot } typename super::reference - operator*() - { - return g_->edge_storage(t_); - } - - const typename super::reference operator*() const { return g_->edge_storage(t_); } typename super::pointer - operator->() - { - return &g_->edge_storage(t_); - } - - const typename super::pointer operator->() const { return &g_->edge_storage(t_); @@ -407,12 +395,12 @@ namespace spot { } - edge_iterator begin() + edge_iterator begin() const { return {g_, t_}; } - edge_iterator end() + edge_iterator end() const { return {}; } @@ -499,23 +487,11 @@ namespace spot } typename super::reference - operator*() - { - return tv_[t_]; - } - - const typename super::reference operator*() const { return tv_[t_]; } - const typename super::pointer - operator->() - { - return &tv_[t_]; - } - typename super::pointer operator->() const { @@ -542,12 +518,12 @@ namespace spot { } - iter_t begin() + iter_t begin() const { return {0, tv_}; } - iter_t end() + iter_t end() const { return {tv_}; }