* mln/util/map.hh: Fix prototype of element(). * mln/util/set.hh: Add a missing include. --- milena/ChangeLog | 8 ++++++++ milena/mln/util/map.hh | 8 ++++---- milena/mln/util/set.hh | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b2a096f..8d00301 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-02-11 Guillaume Lazzara <z@lrde.epita.fr> + + Small fixes. + + * mln/util/map.hh: Fix prototype of element(). + + * mln/util/set.hh: Add a missing include. + 2013-01-04 Guillaume Lazzara <z@lrde.epita.fr> * mln/util/tree_of_shapes.hh: Extend structure for storing new diff --git a/milena/mln/util/map.hh b/milena/mln/util/map.hh index 680d3e4..1cc8309 100644 --- a/milena/mln/util/map.hh +++ b/milena/mln/util/map.hh @@ -205,7 +205,7 @@ namespace mln void invalidate(); /// Give the element the iterator designates. - const std::pair<K,V>& element() const; + subj_t element() const; // As a Proxy. subj_t subj_(); @@ -256,7 +256,7 @@ namespace mln void invalidate(); /// Give the element the iterator designates. - const std::pair<K,V>& element() const; + subj_t element() const; // As a Proxy. subj_t subj_(); @@ -496,7 +496,7 @@ namespace mln template <typename K, typename V> inline - const std::pair<K,V>& + typename map_fwd_iter<K,V>::subj_t map_fwd_iter<K,V>::element() const { mln_precondition(is_valid()); @@ -579,7 +579,7 @@ namespace mln template <typename K, typename V> inline - const std::pair<K,V>& + typename map_bkd_iter<K,V>::subj_t map_bkd_iter<K,V>::element() const { mln_precondition(is_valid()); diff --git a/milena/mln/util/set.hh b/milena/mln/util/set.hh index d9e91e2..6d8608c 100644 --- a/milena/mln/util/set.hh +++ b/milena/mln/util/set.hh @@ -41,6 +41,7 @@ # include <algorithm> # include <iostream> +# include <mln/core/concept/object.hh> # include <mln/core/concept/proxy.hh> # include <mln/util/ord.hh> -- 1.7.2.5