2005-04-05 Thierry GERAUD &lt;theo(a)tegucigalpa.lrde.epita.fr&gt; * oln/core/abstract/point.hh: Conform to mlc macros. * oln/core/abstract/size.hh: Likewise. Index: oln/core/abstract/point.hh =================================================================== --- oln/core/abstract/point.hh (revision 109) +++ oln/core/abstract/point.hh (working copy) @@ -29,9 +29,11 @@ # define OLENA_CORE_ABSTRACT_POINT_HH # include <mlc/any.hh> +# include <mlc/if.hh> +# include <mlc/cmp.hh> + # include <oln/core/coord.hh> # include <oln/core/properties.hh> -# include <mlc/properties.hh> // FIXME: for better 'meta if' and 'meta eq' // fwd decl @@ -41,8 +43,7 @@ -# define oln_point_type_from_2(P1, P2) \ -mlc_internal_if( mlc_internal_eq( P2, oln::any_point ), P1, P2 ) +# define oln_point_type_from_2(P1, P2) mlc_if( mlc_eq( P2, oln::any_point ), P1, P2 ) Index: oln/core/abstract/size.hh =================================================================== --- oln/core/abstract/size.hh (revision 109) +++ oln/core/abstract/size.hh (working copy) @@ -29,7 +29,8 @@ # define OLENA_CORE_ABSTRACT_SIZE_HH # include <mlc/any.hh> -# include <mlc/properties.hh> // FIXME: for better 'meta if' and 'meta eq' +# include <mlc/if.hh> +# include <mlc/cmp.hh> // fwd decl @@ -38,8 +39,7 @@ } -# define oln_size_type_from_2(S1, S2) \ -mlc_internal_if( mlc_internal_eq( S2, oln::any_size ), S1, S2 ) +# define oln_size_type_from_2(S1, S2) mlc_if( mlc_eq( S2, oln::any_size ), S1, S2 )