https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Improve classical points typedefs. * milena/mln/core/point1d.hh, * milena/mln/core/point2d.hh, * milena/mln/core/point2d_h.hh, * milena/mln/core/point3d.hh: Include mln/core/grids.hh. Use fully qualified type names to help swig wrap these typedefs. point1d.hh | 18 ++++++++---------- point2d.hh | 18 ++++++++---------- point2d_h.hh | 17 ++++++++--------- point3d.hh | 16 +++++++--------- 4 files changed, 31 insertions(+), 38 deletions(-) Index: milena/mln/core/point1d.hh --- milena/mln/core/point1d.hh (revision 2093) +++ milena/mln/core/point1d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,22 +28,20 @@ #ifndef MLN_CORE_POINT1D_HH # define MLN_CORE_POINT1D_HH -/*! \file mln/core/point1d.hh - * - * \brief Definition of the mln::point1d alias and of its construction - * routine. - */ +/// \file mln/core/point1d.hh +/// \brief Definition of the mln::point1d alias and of its construction +/// routine. # include <mln/core/point.hh> +# include <mln/core/grids.hh> namespace mln { - /*! \brief Type alias for a point defined on the 1D square grid with - * integer coordinates. - */ - typedef point_<grid::tick, int> point1d; + /// \brief Type alias for a point defined on the 1D square grid with + /// integer coordinates. + typedef point_<mln::grid::tick, int> point1d; } // end of namespace mln Index: milena/mln/core/point3d.hh --- milena/mln/core/point3d.hh (revision 2093) +++ milena/mln/core/point3d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,21 +28,19 @@ #ifndef MLN_CORE_POINT3D_HH # define MLN_CORE_POINT3D_HH -/*! \file mln/core/point3d.hh - * - * \brief Definition of the mln::point3d alias and of its construction - * routine. - */ +/// \file mln/core/point3d.hh +/// \brief Definition of the mln::point3d alias and of its construction +/// routine. # include <mln/core/point.hh> +# include <mln/core/grids.hh> namespace mln { - /*! \brief Type alias for a point defined on the 3D square grid with - * integer coordinates. - */ + /// \brief Type alias for a point defined on the 3D square grid with + /// integer coordinates. typedef point_<grid::cube, int> point3d; Index: milena/mln/core/point2d.hh --- milena/mln/core/point2d.hh (revision 2093) +++ milena/mln/core/point2d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,22 +28,20 @@ #ifndef MLN_CORE_POINT2D_HH # define MLN_CORE_POINT2D_HH -/*! \file mln/core/point2d.hh - * - * \brief Definition of the mln::point2d alias and of its construction - * routine. - */ +/// \file mln/core/point2d.hh +/// \brief Definition of the mln::point2d alias and of its construction +/// routine. # include <mln/core/point.hh> +# include <mln/core/grids.hh> namespace mln { - /*! \brief Type alias for a point defined on the 2D square grid with - * integer coordinates. - */ - typedef point_<grid::square, int> point2d; + /// \brief Type alias for a point defined on the 2D square grid with + /// integer coordinates. + typedef point_<mln::grid::square, int> point2d; } // end of namespace mln Index: milena/mln/core/point2d_h.hh --- milena/mln/core/point2d_h.hh (revision 2093) +++ milena/mln/core/point2d_h.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,21 +28,20 @@ #ifndef MLN_CORE_POINT2D_H_HH # define MLN_CORE_POINT2D_H_HH -/*! \file mln/core/point2d_h.hh - * - * \brief Definition of the mln::point2d_h alias and of its construction - * routine. - */ +/// \file mln/core/point2d_h.hh +/// \brief Definition of the mln::point2d_h alias and of its construction +/// routine. + # include <mln/core/point.hh> +# include <mln/core/grids.hh> namespace mln { - /*! \brief Type alias for a point defined on the 2D square grid with - * integer coordinates. - */ + /// \brief Type alias for a point defined on the 2D hexagonal grid + /// with integer coordinates. typedef point_<grid::hexa, int> point2d_h;