Skip to content

Remove deprecated constexpr definitions #2863

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
merged 1 commit into from
Sep 25, 2025
Merged

Remove deprecated constexpr definitions #2863

Show file tree
Hide file tree
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
30 changes: 0 additions & 30 deletions include/xtensor/containers/xfixed.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,21 +381,6 @@ namespace xt
friend class xcontainer<xfixed_container<ET, S, L, SH, Tag>>;
};

#ifdef XTENSOR_HAS_CONSTEXPR_ENHANCED
// Out of line definitions to prevent linker errors prior to C++17
template <class ET, class S, layout_type L, bool SH, class Tag>
constexpr
typename xfixed_container<ET, S, L, SH, Tag>::inner_shape_type xfixed_container<ET, S, L, SH, Tag>::m_shape;

template <class ET, class S, layout_type L, bool SH, class Tag>
constexpr
typename xfixed_container<ET, S, L, SH, Tag>::inner_strides_type xfixed_container<ET, S, L, SH, Tag>::m_strides;

template <class ET, class S, layout_type L, bool SH, class Tag>
constexpr typename xfixed_container<ET, S, L, SH, Tag>::inner_backstrides_type
xfixed_container<ET, S, L, SH, Tag>::m_backstrides;
#endif

/****************************************
* xfixed_container_adaptor declaration *
****************************************/
Expand Down Expand Up @@ -518,21 +503,6 @@ namespace xt
friend class xcontainer<xfixed_adaptor<EC, S, L, SH, Tag>>;
};

#ifdef XTENSOR_HAS_CONSTEXPR_ENHANCED
// Out of line definitions to prevent linker errors prior to C++17
template <class EC, class S, layout_type L, bool SH, class Tag>
constexpr
typename xfixed_adaptor<EC, S, L, SH, Tag>::inner_shape_type xfixed_adaptor<EC, S, L, SH, Tag>::m_shape;

template <class EC, class S, layout_type L, bool SH, class Tag>
constexpr
typename xfixed_adaptor<EC, S, L, SH, Tag>::inner_strides_type xfixed_adaptor<EC, S, L, SH, Tag>::m_strides;

template <class EC, class S, layout_type L, bool SH, class Tag>
constexpr typename xfixed_adaptor<EC, S, L, SH, Tag>::inner_backstrides_type
xfixed_adaptor<EC, S, L, SH, Tag>::m_backstrides;
#endif

/************************************
* xfixed_container implementation *
************************************/
Expand Down
5 changes: 0 additions & 5 deletions include/xtensor/containers/xstorage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,11 +1731,6 @@ namespace xt
XTENSOR_CONSTEXPR_ENHANCED_STATIC cast_type m_array = cast_type({X...});
};

#ifdef XTENSOR_HAS_CONSTEXPR_ENHANCED
template <std::size_t... X>
constexpr typename fixed_shape<X...>::cast_type fixed_shape<X...>::m_array;
#endif

#undef XTENSOR_FIXED_SHAPE_CONSTEXPR

template <class E, std::ptrdiff_t Start, std::ptrdiff_t End = -1>
Expand Down
12 changes: 0 additions & 12 deletions include/xtensor/core/xfunction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,6 @@ namespace xt
XTENSOR_CONSTEXPR_ENHANCED_STATIC bool is_initialized = true;
};

#ifdef XTENSOR_HAS_CONSTEXPR_ENHANCED
// Out of line definitions to prevent linker errors prior to C++17
template <std::size_t... N, class is_shape_trivial>
constexpr fixed_shape<N...> xfunction_cache_impl<fixed_shape<N...>, is_shape_trivial>::shape;

template <std::size_t... N, class is_shape_trivial>
constexpr bool xfunction_cache_impl<fixed_shape<N...>, is_shape_trivial>::is_trivial;

template <std::size_t... N, class is_shape_trivial>
constexpr bool xfunction_cache_impl<fixed_shape<N...>, is_shape_trivial>::is_initialized;
#endif

template <class... CT>
struct xfunction_bool_load_type
{
Expand Down
Loading