[Olena-patches] 2570: Fix wrong namespaces.

--- ChangeLog | 18 +++++++++++++----- milena/mln/level/fill_with_image.hh | 2 +- milena/mln/level/paste.hh | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5ed23d..e039de5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,21 @@ 2008-16-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix ambiguous namespaces. + * milena/mln/level/fill_with_image.hh + * milena/mln/level/paste.hh: + Fix compilation error. It could not resolve the correct namespace + path. + +2008-16-07 Guillaume Lazzara <z(a)lrde.epita.fr> + Update tutorial. - * samples/ima2d-1.tex, - * samples/ima2d-3.tex, - * samples/paste-call-1.tex, - * samples/point-1.tex: + * milena/doc/tutorial/samples/ima2d-1.tex, + * milena/doc/tutorial/samples/ima2d-3.tex, + * milena/doc/tutorial/samples/paste-call-1.tex, + * milena/doc/tutorial/samples/point-1.tex: Add new sample code. - * tutorial.tex: + * milena/doc/tutorial/tutorial.tex: Mainly update image chapter. Cleanup source. diff --git a/milena/mln/level/fill_with_image.hh b/milena/mln/level/fill_with_image.hh index 47b6e7f..d63d69d 100644 --- a/milena/mln/level/fill_with_image.hh +++ b/milena/mln/level/fill_with_image.hh @@ -103,7 +103,7 @@ namespace mln I& ima = exact(ima_); const J& data = exact(data_); - internal::fill_with_image_tests(ima, data); + level::internal::fill_with_image_tests(ima, data); mln_piter(I) p(ima.domain()); for_all(p) diff --git a/milena/mln/level/paste.hh b/milena/mln/level/paste.hh index 938d406..2821a04 100644 --- a/milena/mln/level/paste.hh +++ b/milena/mln/level/paste.hh @@ -103,7 +103,7 @@ namespace mln { trace::entering("level::impl::generic::paste"); - internal::paste_tests(data_, destination_); + level::internal::paste_tests(data_, destination_); const I& data = exact(data_); J& destination = exact(destination_); -- 1.5.6.5