Skip to content

Fixed lambda return type used in xfunxtion #2913

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

Open
JohanMabille wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Fixed lambda return type used in xfunxtion #2913

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
14 changes: 7 additions & 7 deletions include/xtensor/core/xfunction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ namespace xt
// leading to warning about signed/unsigned conversions in the deeper layers of the access methods

return std::apply(
[&](auto&... e)
[&](auto&... e) -> const_reference
{
XTENSOR_TRY(check_index(shape(), args...));
XTENSOR_CHECK_DIMENSION(shape(), args...);
Expand All @@ -631,7 +631,7 @@ namespace xt
inline auto xfunction<F, CT...>::flat(size_type index) const -> const_reference
{
return std::apply(
[&](auto&... e)
[&](auto&... e) -> const_reference
{
return m_f(e.data_element(index)...);
},
Expand Down Expand Up @@ -665,7 +665,7 @@ namespace xt
// The static cast prevents the compiler from instantiating the template methods with signed integers,
// leading to warning about signed/unsigned conversions in the deeper layers of the access methods
return std::apply(
[&](const auto&... e)
[&](const auto&... e) -> const_reference
{
return m_f(e.unchecked(static_cast<size_type>(args)...)...);
},
Expand All @@ -685,7 +685,7 @@ namespace xt
inline auto xfunction<F, CT...>::element(It first, It last) const -> const_reference
{
return std::apply(
[&](auto&... e)
[&](auto&... e) -> const_reference
{
XTENSOR_TRY(check_element_index(shape(), first, last));
return m_f(e.element(first, last)...);
Expand Down Expand Up @@ -826,7 +826,7 @@ namespace xt
inline auto xfunction<F, CT...>::data_element(size_type i) const -> const_reference
{
return std::apply(
[&](auto&... e)
[&](auto&... e) -> const_reference
{
return m_f(e.data_element(i)...);
},
Expand Down Expand Up @@ -957,7 +957,7 @@ namespace xt
inline auto xfunction_iterator<F, CT...>::operator*() const -> reference
{
return std::apply(
[&](auto&... it)
[&](auto&... it) -> reference
{
return (p_f->m_f)(*it...);
},
Expand Down Expand Up @@ -1109,7 +1109,7 @@ namespace xt
inline auto xfunction_stepper<F, CT...>::operator*() const -> reference
{
return std::apply(
[&](auto&... e)
[&](auto&... e) -> reference
{
return (p_f->m_f)(*e...);
},
Expand Down
Loading