https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Improve classical dpoints typedefs. * mln/core/dpoint.hh: Use fully qualified type names to help swig wrap these typedefs. * mln/core/dpoint1d.hh, * mln/core/dpoint2d.hh, * mln/core/dpoint2d_h.hh, * mln/core/dpoint3d.hh: Likewise. Include mln/core/grids.hh. dpoint.hh | 10 +++++----- dpoint1d.hh | 3 ++- dpoint2d.hh | 3 ++- dpoint2d_h.hh | 3 ++- dpoint3d.hh | 3 ++- 5 files changed, 13 insertions(+), 9 deletions(-) Index: mln/core/dpoint.hh --- mln/core/dpoint.hh (revision 2100) +++ mln/core/dpoint.hh (working copy) @@ -114,13 +114,13 @@ /// Conversion towards a algebra::vec. template <typename Q> - operator algebra::vec<M::dim, Q>() const; + operator mln::algebra::vec<M::dim, Q>() const; /// Explicit conversion. - algebra::vec<M::dim, C> to_vec() const; + mln::algebra::vec<M::dim, C> to_vec() const; protected: - algebra::vec<M::dim, C> coord_; + mln::algebra::vec<M::dim, C> coord_; }; @@ -231,14 +231,14 @@ template <typename M, typename C> template <typename Q> inline - dpoint_<M,C>::operator algebra::vec<M::dim, Q> () const + dpoint_<M,C>::operator mln::algebra::vec<M::dim, Q> () const { return coord_; } template <typename M, typename C> inline - algebra::vec<M::dim, C> + mln::algebra::vec<M::dim, C> dpoint_<M,C>::to_vec() const { return coord_; Index: mln/core/dpoint1d.hh --- mln/core/dpoint1d.hh (revision 2100) +++ mln/core/dpoint1d.hh (working copy) @@ -35,6 +35,7 @@ */ # include <mln/core/dpoint.hh> +# include <mln/core/grids.hh> namespace mln @@ -43,7 +44,7 @@ /*! \brief Type alias for a delta-point defined on the 1D square * grid with integer coordinates. */ - typedef dpoint_<grid::tick, int> dpoint1d; + typedef dpoint_<mln::grid::tick, int> dpoint1d; } // end of namespace mln Index: mln/core/dpoint2d.hh --- mln/core/dpoint2d.hh (revision 2100) +++ mln/core/dpoint2d.hh (working copy) @@ -35,6 +35,7 @@ */ # include <mln/core/dpoint.hh> +# include <mln/core/grids.hh> namespace mln @@ -43,7 +44,7 @@ /*! \brief Type alias for a delta-point defined on the 2D square * grid with integer coordinates. */ - typedef dpoint_<grid::square, int> dpoint2d; + typedef dpoint_<mln::grid::square, int> dpoint2d; } // end of namespace mln Index: mln/core/dpoint2d_h.hh --- mln/core/dpoint2d_h.hh (revision 2100) +++ mln/core/dpoint2d_h.hh (working copy) @@ -35,6 +35,7 @@ */ # include <mln/core/dpoint.hh> +# include <mln/core/grids.hh> namespace mln @@ -43,7 +44,7 @@ /*! \brief Type alias for a delta-point defined on the 2D square * grid with integer coordinates. */ - typedef dpoint_<grid::hexa, int> dpoint2d_h; + typedef dpoint_<mln::grid::hexa, int> dpoint2d_h; } // end of namespace mln Index: mln/core/dpoint3d.hh --- mln/core/dpoint3d.hh (revision 2100) +++ mln/core/dpoint3d.hh (working copy) @@ -35,6 +35,7 @@ */ # include <mln/core/dpoint.hh> +# include <mln/core/grids.hh> namespace mln @@ -43,7 +44,7 @@ /*! \brief Type alias for a delta-point defined on the 3D square * grid with integer coordinates. */ - typedef dpoint_<grid::cube, int> dpoint3d; + typedef dpoint_<mln::grid::cube, int> dpoint3d; } // end of namespace mln