* mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_): Define new macros to work outside templates. --- milena/ChangeLog | 7 +++++++ milena/mln/linear/ch_convolve.hh | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b3cd42e..10c5def 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2009-12-02 Yann Jacquelet <jacquelet@lrde.epita.fr> + + Fix the outside template use case for the convolve macros. + + * mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_): + Define new macros to work outside templates. + 2009-11-18 Guillaume Lazzara <z@lrde.epita.fr> * doc/white_paper/white_paper.tex: Fix an invalid URL. diff --git a/milena/mln/linear/ch_convolve.hh b/milena/mln/linear/ch_convolve.hh index ef9fb42..9ea45e5 100644 --- a/milena/mln/linear/ch_convolve.hh +++ b/milena/mln/linear/ch_convolve.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -44,9 +45,15 @@ # define mln_ch_convolve(I, W) \ typename mln::linear::ch_convolve<I, W>::ret +# define mln_ch_convolve_(I, W) \ + mln::linear::ch_convolve<I, W>::ret + + # define mln_ch_convolve_grad(I, W) \ typename mln::trait::ch_value< I, algebra::vec< I::site::dim, typename mln::linear::ch_convolve<I,W>::ret::value > >::ret +# define mln_ch_convolve_grad_(I, W) \ + mln::trait::ch_value< I, algebra::vec< I::site::dim, mln::linear::ch_convolve<I,W>::ret::value > >::ret namespace mln -- 1.5.6.5