Skip to content

Fix compatibility with Boost.Python >= 1.77 #256

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 3 commits into from
Aug 27, 2021
Merged

Fix compatibility with Boost.Python >= 1.77 #256

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f486537
core: fix typedef
jcarpent Aug 27, 2021
44e2f48
core: fix compatibility with Boost.Python >= 1.77
jcarpent Aug 27, 2021
7bb3f89
core: fix typedef
jcarpent Aug 27, 2021
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: 17 additions & 7 deletions include/eigenpy/eigen-from-python.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,16 @@ namespace eigenpy
struct referent_storage_eigen_ref
{
typedef Eigen::Ref<MatType,Options,Stride> RefType;

#if BOOST_VERSION / 100 % 1000 >= 77
typedef typename ::boost::python::detail::aligned_storage<
::boost::python::detail::referent_size<RefType&>::value,
::boost::alignment_of<RefType&>::value
>::type AlignedStorage;
#else
typedef ::boost::python::detail::aligned_storage<
::boost::python::detail::referent_size<RefType&>::value
> AlignedStorage;
#endif

referent_storage_eigen_ref()
: pyArray(NULL)
Expand Down Expand Up @@ -93,18 +99,22 @@ namespace boost { namespace python { namespace detail {
struct referent_storage<Eigen::Ref<MatType,Options,Stride> &>
{
typedef ::eigenpy::details::referent_storage_eigen_ref<MatType,Options,Stride> StorageType;
typedef aligned_storage<
::boost::python::detail::referent_size<StorageType&>::value
> type;
#if BOOST_VERSION / 100 % 1000 >= 77
typedef typename aligned_storage<referent_size<StorageType&>::value>::type type;
#else
typedef aligned_storage<referent_size<StorageType&>::value> type;
#endif
};

template<typename MatType, int Options, typename Stride>
struct referent_storage<const Eigen::Ref<const MatType,Options,Stride> &>
{
typedef ::eigenpy::details::referent_storage_eigen_ref<const MatType,Options,Stride> StorageType;
typedef aligned_storage<
::boost::python::detail::referent_size<StorageType&>::value
> type;
#if BOOST_VERSION / 100 % 1000 >= 77
typedef typename aligned_storage<referent_size<StorageType&>::value, alignment_of<StorageType&>::value>::type type;
#else
typedef aligned_storage<referent_size<StorageType&>::value> type;
#endif
};
#endif
}}}
Expand Down