[Olena-patches] proto-1.0 104: Minor fix (missing headers and g++-3.4 compliance)

Index: ChangeLog from Simon Odou &lt;simon(a)lrde.epita.fr&gt; * oln/core/pw/times.hh: Add missing header. * oln/core/pw/div.hh: Likewise. * oln/core/pw/plus.hh: Likewise. * oln/core/pw/minus.hh: Likewise. * oln/core/any/dpoint.hh: Likewise. * oln/core/any/point.hh: g++-3.4 compliance. * oln/utils/clone.hh: Likewise. * oln/morpho/dilation.hh: Likewise. * oln/morpho/erosion.hh: Likewise. core/any/dpoint.hh | 1 + core/any/point.hh | 1 + core/pw/div.hh | 1 + core/pw/minus.hh | 1 + core/pw/plus.hh | 1 + core/pw/times.hh | 1 + morpho/dilation.hh | 8 ++++---- morpho/erosion.hh | 8 ++++---- utils/clone.hh | 8 ++++---- 9 files changed, 18 insertions(+), 12 deletions(-) Index: oln/core/pw/times.hh --- oln/core/pw/times.hh (revision 103) +++ oln/core/pw/times.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_PW_TIMES_HH # include <oln/core/pw/abstract/function.hh> +# include <oln/core/pw/literal.hh> # include <ntg/all.hh> Index: oln/core/pw/div.hh --- oln/core/pw/div.hh (revision 103) +++ oln/core/pw/div.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_PW_DIV_HH # include <oln/core/pw/abstract/function.hh> +# include <oln/core/pw/literal.hh> # include <ntg/all.hh> Index: oln/core/pw/plus.hh --- oln/core/pw/plus.hh (revision 103) +++ oln/core/pw/plus.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_PW_PLUS_HH # include <oln/core/pw/abstract/function.hh> +# include <oln/core/pw/literal.hh> # include <ntg/all.hh> Index: oln/core/pw/minus.hh --- oln/core/pw/minus.hh (revision 103) +++ oln/core/pw/minus.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_PW_MINUS_HH # include <oln/core/pw/abstract/function.hh> +# include <oln/core/pw/literal.hh> # include <ntg/all.hh> Index: oln/core/any/point.hh --- oln/core/any/point.hh (revision 103) +++ oln/core/any/point.hh (working copy) @@ -39,6 +39,7 @@ struct any_dpoint; // category + template <> struct set_category< any_point > { typedef category::point ret; }; // props Index: oln/core/any/dpoint.hh --- oln/core/any/dpoint.hh (revision 103) +++ oln/core/any/dpoint.hh (working copy) @@ -29,6 +29,7 @@ # define OLENA_CORE_ANY_DPOINT_HH # include <oln/core/abstract/dpoint.hh> +# include <oln/core/any/point.hh> namespace oln { Index: oln/utils/clone.hh --- oln/utils/clone.hh (revision 103) +++ oln/utils/clone.hh (working copy) @@ -72,12 +72,12 @@ void impl_run() { - I tmp(input.size()); // FIXME: trick - output = tmp; + I tmp(this->input.size()); // FIXME: trick + this->output = tmp; - oln_type_of(I, fwd_piter) p(input.size()); + oln_type_of(I, fwd_piter) p(this->input.size()); for_all(p) - output[p] = input[p]; + this->output[p] = this->input[p]; } }; Index: oln/morpho/dilation.hh --- oln/morpho/dilation.hh (revision 103) +++ oln/morpho/dilation.hh (working copy) @@ -172,12 +172,12 @@ mlc::is_true<mlc::type::eq<oln_type_of(I, size), oln_type_of(S, size)>::ret>::ensure(); - output_type tmp(input.size()); // FIXME: trick - output = tmp; + output_type tmp(this->input.size()); // FIXME: trick + this->output = tmp; - oln_type_of(I, fwd_piter) p(input.size()); + oln_type_of(I, fwd_piter) p(this->input.size()); for_all (p) - output[p] = morpho::max(input, p, se); + this->output[p] = morpho::max(this->input, p, this->se); } }; Index: oln/morpho/erosion.hh --- oln/morpho/erosion.hh (revision 103) +++ oln/morpho/erosion.hh (working copy) @@ -163,12 +163,12 @@ mlc::is_true<mlc::type::eq<oln_type_of(I, size), oln_type_of(S, size)>::ret>::ensure(); - output_type tmp(input.size()); // FIXME: trick - output = tmp; + output_type tmp(this->input.size()); // FIXME: trick + this->output = tmp; - oln_type_of(I, fwd_piter) p(input.size()); + oln_type_of(I, fwd_piter) p(this->input.size()); for_all (p) - output[p] = morpho::min(input, p, se); + this->output[p] = morpho::min(this->input, p, this->se); } };