[Olena-patches] last-svn-commit-819-gaac2de9 Add missing anchor argument.

* scribo/primitive/link/internal/find_several_links.hh, * scribo/primitive/link/internal/link_several_dmax_base.hh, * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. --- scribo/ChangeLog | 8 ++++++++ .../primitive/link/internal/find_several_links.hh | 8 ++++---- .../link/internal/link_several_dmax_base.hh | 7 +++++-- .../link/internal/link_single_dmax_base.hh | 10 +++++++--- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f84156c..38a9966 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add missing anchor argument. + + * scribo/primitive/link/internal/find_several_links.hh, + * scribo/primitive/link/internal/link_several_dmax_base.hh, + * scribo/primitive/link/internal/link_single_dmax_base.hh: Here. + +2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Regen generated files. * headers.mk, diff --git a/scribo/scribo/primitive/link/internal/find_several_links.hh b/scribo/scribo/primitive/link/internal/find_several_links.hh index 4d9404e..2d4a663 100644 --- a/scribo/scribo/primitive/link/internal/find_several_links.hh +++ b/scribo/scribo/primitive/link/internal/find_several_links.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -106,10 +106,10 @@ namespace scribo && ! functor.is_potential_link(current_object, start_point, p) // <-- is_potential_link && functor.verify_link_criterion(current_object, - start_point, p)) // <-- verify_link_criterion + start_point, p, anchor)) // <-- verify_link_criterion functor.compute_next_site(p); // <-- compute_next_site - if (functor.valid_link(current_object, start_point, p)) // <-- valid_link + if (functor.valid_link(current_object, start_point, p, anchor)) // <-- valid_link functor.validate_link(current_object, start_point, p, anchor); // <-- validate_link else functor.invalidate_link(current_object, start_point, p, anchor); // <-- invalidate_link diff --git a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh index e5b9ce2..422eed9 100644 --- a/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_several_dmax_base.hh @@ -84,7 +84,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, const P& start_point, - const P& p) const; + const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -133,9 +134,11 @@ namespace scribo link_several_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far diff --git a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh index aca3e67..113411c 100644 --- a/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh +++ b/scribo/scribo/primitive/link/internal/link_single_dmax_base.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -81,7 +82,8 @@ namespace scribo bool verify_link_criterion_(unsigned current_object, - const P& start_point, const P& p) const; + const P& start_point, const P& p, + anchor::Type anchor) const; void start_processing_object_(unsigned current_object); @@ -116,9 +118,11 @@ namespace scribo link_single_dmax_base<L, E>::verify_link_criterion_( unsigned current_object, const P& start_point, - const P& p) const + const P& p, + anchor::Type anchor) const { (void) current_object; + (void) anchor; float dist = math::abs(p[direction_] - start_point[direction_]); return dist <= dmax_; // Not too far -- 1.5.6.5