[Olena-patches] olena-2.0-538-g07333d2 doc/Doxyfile.in: Expand more macros.

--- scribo/ChangeLog | 4 ++++ scribo/doc/Doxyfile.in | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index dd9004e..3d971b9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-04-17 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * doc/Doxyfile.in: Expand more macros. + +2013-04-17 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * doc/Doxyfile.in: Exclude internal symbols from documentation. 2013-04-17 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index f9d930c..904121c 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -227,7 +227,8 @@ EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ +PREDEFINED = MLN_INCLUDE_ONLY \ + "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ "for_all_2(x1, x2)=for(x1.start(), x2.start(); x1.is_valid(); x1.next(), x2.next())" \ "for_all_3(x1, x2, x3)=for(x1.start(), x2.start(), x3.start(); x1.is_valid(); x1.next(), x2.next(), x3.next())" \ "for_all_remaining(x)=if (! x.is_valid()) {} else while (x.next(), x.is_valid())" \ @@ -325,9 +326,11 @@ PREDEFINED = "for_all(x)=for(x.start(); x.is_valid(); x.next())" \ "mln_graph_element_(T)=T::graph_element" \ "mln_fun_vv2v(F, L, R)=mln::fun::vv2v::F< mln_value(L), mln_value(R) >" \ "mln_fun_vv2v_result(F, L, R)=typename mln_fun_vv2v(F, L, R)::result" \ - "mln_ch_fun_vv2v(F, L, R)=typename mln::trait::ch_value< L, typename mln_fun_vv2v(F, L, R)::result >::ret" - - + "mln_ch_fun_vv2v(F, L, R)=typename mln::trait::ch_value< L, typename mln_fun_vv2v(F, L, R)::result >::ret" \ + "mln_ch_convolve(I, W)=typename mln::linear::ch_convolve<I, W>::ret" \ + "mln_ch_convolve_(I, W)=mln::linear::ch_convolve<I, W>::ret" \ + "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" \ + "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" EXPAND_AS_DEFINED = -- 1.7.2.5