--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/def/lbl_type.hh | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e79e597..df9110d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara <z@lrde.epita.fr> + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. + +2011-03-14 Guillaume Lazzara <z@lrde.epita.fr> + Set unit tests dependencies. * tests/unit_test/Makefile.am: Add new conditional test file. diff --git a/scribo/scribo/core/def/lbl_type.hh b/scribo/scribo/core/def/lbl_type.hh index 6434bbe..90cc932 100644 --- a/scribo/scribo/core/def/lbl_type.hh +++ b/scribo/scribo/core/def/lbl_type.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -30,7 +31,8 @@ /// /// Global type definition for labels. -# include <mln/value/label.hh> +# include <mln/value/int_u.hh> +//# include <mln/value/label.hh> namespace scribo @@ -39,7 +41,11 @@ namespace scribo namespace def { - typedef mln::value::label<30u> lbl_type; + // FIXME: we would like to use label type. We have got problems + // with types conversions and data computation (no arithmetic + // operators on labels!) + typedef mln::value::int_u<30u> lbl_type; +// typedef mln::value::label<30u> lbl_type; } // end of namespace scribo::def -- 1.5.6.5