* doc/mln/core/alias/box1d.dox, * doc/mln/core/alias/box2d.dox, * doc/mln/core/alias/box2d_h.dox, * doc/mln/core/alias/box3d.dox: Make class inherit from box_impl. Conflicts: milena/ChangeLog --- milena/ChangeLog | 9 +++++++++ milena/doc/mln/core/alias/box1d.dox | 4 +++- milena/doc/mln/core/alias/box2d.dox | 4 +++- milena/doc/mln/core/alias/box2d_h.dox | 4 +++- milena/doc/mln/core/alias/box3d.dox | 4 +++- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 802263d..1d6a146 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-04-30 Guillaume Lazzara <z@lrde.epita.fr> + Fix missing parts of mln::box interface in documentation. + + * doc/mln/core/alias/box1d.dox, + * doc/mln/core/alias/box2d.dox, + * doc/mln/core/alias/box2d_h.dox, + * doc/mln/core/alias/box3d.dox: Make class inherit from box_impl. + +2013-04-30 Guillaume Lazzara <z@lrde.epita.fr> + * mln/core/var.hh: Document mln_VAR(). 2013-04-30 Guillaume Lazzara <z@lrde.epita.fr> diff --git a/milena/doc/mln/core/alias/box1d.dox b/milena/doc/mln/core/alias/box1d.dox index d2f3827..f1460bd 100644 --- a/milena/doc/mln/core/alias/box1d.dox +++ b/milena/doc/mln/core/alias/box1d.dox @@ -3,7 +3,9 @@ namespace mln { - class box1d : public mln::box<mln::point1d> + class box1d + : public mln::box<mln::point1d>, + public internal::box_impl_<1,C,E> { public: /// \brief Constructor without argument. diff --git a/milena/doc/mln/core/alias/box2d.dox b/milena/doc/mln/core/alias/box2d.dox index f599a79..68a826e 100644 --- a/milena/doc/mln/core/alias/box2d.dox +++ b/milena/doc/mln/core/alias/box2d.dox @@ -3,7 +3,9 @@ namespace mln { - class box2d : public mln::box<mln::point2d> + class box2d + : public mln::box<mln::point2d>, + public internal::box_impl_<2,C,E> { public: /// \brief Constructor without argument. diff --git a/milena/doc/mln/core/alias/box2d_h.dox b/milena/doc/mln/core/alias/box2d_h.dox index 5cc21c6..a456ca4 100644 --- a/milena/doc/mln/core/alias/box2d_h.dox +++ b/milena/doc/mln/core/alias/box2d_h.dox @@ -3,7 +3,9 @@ namespace mln { - class box2d_h : public mln::box<mln::point2d_h> + class box2d_h + : public mln::box<mln::point2d_h>, + public internal::box_impl_<2,C,E> { public: /// \brief Constructor without argument. diff --git a/milena/doc/mln/core/alias/box3d.dox b/milena/doc/mln/core/alias/box3d.dox index f5fc020..ba02547 100644 --- a/milena/doc/mln/core/alias/box3d.dox +++ b/milena/doc/mln/core/alias/box3d.dox @@ -3,7 +3,9 @@ namespace mln { - class box3d : public mln::box<mln::point3d> + class box3d + : public mln::box<mln::point3d>, + public internal::box_impl_<3,C,E> { public: /// \brief Constructor without argument. -- 1.7.2.5