URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-04-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> Merge changes in component tree file. * mln/morpho/tree/data.hh: Resolve conflicts between theo's and edwin's code. --- data.hh | 4 ---- 1 file changed, 4 deletions(-) Index: trunk/milena/mln/morpho/tree/data.hh =================================================================== --- trunk/milena/mln/morpho/tree/data.hh (revision 3653) +++ trunk/milena/mln/morpho/tree/data.hh (revision 3654) @@ -51,10 +51,6 @@ # define mln_leaf_piter(T) typename T::leaf_piter # define mln_preorder_piter(T) typename T::preorder_piter -# define mln_site_piter(T) typename T::up_site_piter -# define mln_node_piter(T) typename T::up_node_piter -# define mln_leaf_piter(T) typename T::up_leaf_piter - # define mln_up_site_piter_(T) T::up_site_piter # define mln_dn_site_piter_(T) T::dn_site_piter # define mln_up_node_piter_(T) T::up_node_piter