Skip to content

Make stepper_begin and stepper_end templates #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SylvainCorlay merged 1 commit into from
Dec 18, 2016
Merged

Make stepper_begin and stepper_end templates #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions include/xtensor-python/pyarray.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,15 @@ namespace xt
template <class S>
xiterator<const_stepper, S> cxend(const S& shape) const;

stepper stepper_begin(const shape_type& shape);
stepper stepper_end(const shape_type& shape);
template <class S>
stepper stepper_begin(const S& shape);
template <class S>
stepper stepper_end(const S& shape);

const_stepper stepper_begin(const shape_type& shape) const;
const_stepper stepper_end(const shape_type& shape) const;
template <class S>
const_stepper stepper_begin(const S& shape) const;
template <class S>
const_stepper stepper_end(const S& shape) const;

storage_iterator storage_begin();
storage_iterator storage_end();
Expand Down Expand Up @@ -474,28 +478,32 @@ namespace xt
}

template <class T, int ExtraFlags>
inline auto pyarray<T, ExtraFlags>::stepper_begin(const shape_type& shape) -> stepper
template <class S>
inline auto pyarray<T, ExtraFlags>::stepper_begin(const S& shape) -> stepper
{
size_type offset = shape.size() - dimension();
return stepper(this, storage_begin(), offset);
}

template <class T, int ExtraFlags>
inline auto pyarray<T, ExtraFlags>::stepper_end(const shape_type& shape) -> stepper
template <class S>
inline auto pyarray<T, ExtraFlags>::stepper_end(const S& shape) -> stepper
{
size_type offset = shape.size() - dimension();
return stepper(this, storage_end(), offset);
}

template <class T, int ExtraFlags>
inline auto pyarray<T, ExtraFlags>::stepper_begin(const shape_type& shape) const -> const_stepper
template <class S>
inline auto pyarray<T, ExtraFlags>::stepper_begin(const S& shape) const -> const_stepper
{
size_type offset = shape.size() - dimension();
return const_stepper(this, storage_begin(), offset);
}

template <class T, int ExtraFlags>
inline auto pyarray<T, ExtraFlags>::stepper_end(const shape_type& shape) const -> const_stepper
template <class S>
inline auto pyarray<T, ExtraFlags>::stepper_end(const S& shape) const -> const_stepper
{
size_type offset = shape.size() - dimension();
return const_stepper(this, storage_end(), offset);
Expand Down