[Olena-patches] milena r1532: Update in mln::util

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-23 Guillaume Duhamel &lt;guillaume.duhamel(a)lrde.epita.fr&gt; Update in mln::util. * mln/util/all.hh: Add all headers. * mln/util/branch_iter.hh, * mln/util/branch_iter_ind.hh, * mln/util/graph.hh, * mln/util/ordpair.hh: Check typo. --- all.hh | 8 ++++++++ branch_iter.hh | 2 +- branch_iter_ind.hh | 11 ++--------- 3 files changed, 11 insertions(+), 10 deletions(-) Index: trunk/milena/mln/util/graph.hh =================================================================== Index: trunk/milena/mln/util/all.hh =================================================================== --- trunk/milena/mln/util/all.hh (revision 1531) +++ trunk/milena/mln/util/all.hh (revision 1532) @@ -42,11 +42,19 @@ } +# include <mln/util/branch_iter.hh> +# include <mln/util/branch_iter_ind.hh> # include <mln/util/eat.hh> # include <mln/util/graph.hh> # include <mln/util/ignore.hh> # include <mln/util/nil.hh> +# include <mln/util/ordpair.hh> # include <mln/util/pix.hh> # include <mln/util/tracked_ptr.hh> +# include <mln/util/tree_fast.hh> +# include <mln/util/tree_fast_to_image.hh> +# include <mln/util/tree.hh> +# include <mln/util/tree_to_fast.hh> +# include <mln/util/tree_to_image.hh> #endif // ! MLN_UTIL_ALL_HH Index: trunk/milena/mln/util/branch_iter_ind.hh =================================================================== --- trunk/milena/mln/util/branch_iter_ind.hh (revision 1531) +++ trunk/milena/mln/util/branch_iter_ind.hh (revision 1532) @@ -173,7 +173,7 @@ else { s_.top().pos_++; - if (s_.top().list_->size() == s_.top().pos_) + if (s_.top().list_->size() == (unsigned)s_.top().pos_) { s_.pop(); next(); @@ -181,16 +181,9 @@ } else { - mln_assertion(s_.top().list_->size() > s_.top().pos_); + mln_assertion(s_.top().list_->size() > (unsigned)s_.top().pos_); if (s_.top().previous_ != 0) mln_assertion(s_.top().previous_ == (*(s_.top().list_))[s_.top().pos_ - 1]); - // if (s_.top().previous_ > 0) -// { -// if(previous_ == (*(s_.top().first))[s_.top().second - 1]) -// { -// std::cout << -// } -// } n_ = (*(s_.top().list_))[s_.top().pos_]; s_.top().previous_ = n_; Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1531) +++ trunk/milena/mln/util/branch_iter.hh (revision 1532) @@ -47,7 +47,7 @@ /*! \brief Basic 2D image class. * * The parameter \c T is the type of node's data. branch_iter is used to pre-order walk a branch. - + * */ template <typename T> class branch_iter Index: trunk/milena/mln/util/ordpair.hh ===================================================================