diff options
Diffstat (limited to 'boost/gil/position_iterator.hpp')
| -rw-r--r-- | boost/gil/position_iterator.hpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/boost/gil/position_iterator.hpp b/boost/gil/position_iterator.hpp index 747123c1ac..0e29c2f6c8 100644 --- a/boost/gil/position_iterator.hpp +++ b/boost/gil/position_iterator.hpp @@ -16,7 +16,7 @@ namespace boost { namespace gil { /// \defgroup PixelIteratorModelVirtual position_iterator /// \ingroup PixelIteratorModel -/// \brief An iterator that remembers its current X,Y position and invokes a function object with it upon dereferencing. Models PixelIteratorConcept, PixelBasedConcept, HasDynamicXStepTypeConcept. Used to create virtual image views. +/// \brief An iterator that remembers its current X,Y position and invokes a function object with it upon dereferencing. Models PixelIteratorConcept, PixelBasedConcept, HasDynamicXStepTypeConcept. Used to create virtual image views. /// \brief An iterator that remembers its current X,Y position and invokes a function object with it upon dereferencing. Models PixelIteratorConcept. Used to create virtual image views. @@ -29,14 +29,14 @@ struct position_iterator : public iterator_facade<position_iterator<Deref,Dim>, std::random_access_iterator_tag, typename Deref::reference, typename Deref::argument_type::template axis<Dim>::coord_t> { - typedef iterator_facade<position_iterator<Deref,Dim>, + using parent_t = iterator_facade<position_iterator<Deref,Dim>, typename Deref::value_type, std::random_access_iterator_tag, typename Deref::reference, - typename Deref::argument_type::template axis<Dim>::coord_t> parent_t; - typedef typename parent_t::difference_type difference_type; - typedef typename parent_t::reference reference; - typedef typename Deref::argument_type point_t; + typename Deref::argument_type::template axis<Dim>::coord_t>; + using difference_type = typename parent_t::difference_type; + using reference = typename parent_t::reference; + using point_t = typename Deref::argument_type; position_iterator() {} position_iterator(const point_t& p, const point_t& step, const Deref& d) : _p(p), _step(step), _d(d) {} @@ -69,12 +69,12 @@ private: bool equal(const position_iterator& it) const { return _p==it._p; } }; -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct const_iterator_type<position_iterator<Deref,Dim> > { - typedef position_iterator<typename Deref::const_t,Dim> type; + using type = position_iterator<typename Deref::const_t,Dim>; }; -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct iterator_is_mutable<position_iterator<Deref,Dim> > : public mpl::bool_<Deref::is_mutable> { }; @@ -82,25 +82,25 @@ struct iterator_is_mutable<position_iterator<Deref,Dim> > : public mpl::bool_<De // PixelBasedConcept ///////////////////////////// -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct color_space_type<position_iterator<Deref,Dim> > : public color_space_type<typename Deref::value_type> {}; -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct channel_mapping_type<position_iterator<Deref,Dim> > : public channel_mapping_type<typename Deref::value_type> {}; -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct is_planar<position_iterator<Deref,Dim> > : public mpl::false_ {}; -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct channel_type<position_iterator<Deref,Dim> > : public channel_type<typename Deref::value_type> {}; ///////////////////////////// // HasDynamicXStepTypeConcept ///////////////////////////// -template <typename Deref,int Dim> +template <typename Deref,int Dim> struct dynamic_x_step_type<position_iterator<Deref,Dim> > { - typedef position_iterator<Deref,Dim> type; + using type = position_iterator<Deref,Dim>; }; } } // namespace boost::gil |