Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
eigenpy
Commits
c4d22398
Verified
Commit
c4d22398
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
core: add fix for bug in boost::rvalue_from_python_data
parent
1e0eb6e4
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+1
-0
1 addition, 0 deletions
CMakeLists.txt
include/eigenpy/details.hpp
+1
-0
1 addition, 0 deletions
include/eigenpy/details.hpp
include/eigenpy/details/rvalue_from_python_data.hpp
+55
-0
55 additions, 0 deletions
include/eigenpy/details/rvalue_from_python_data.hpp
with
57 additions
and
0 deletions
CMakeLists.txt
+
1
−
0
View file @
c4d22398
...
@@ -103,6 +103,7 @@ SET(${PROJECT_NAME}_HEADERS
...
@@ -103,6 +103,7 @@ SET(${PROJECT_NAME}_HEADERS
include/eigenpy/quaternion.hpp
include/eigenpy/quaternion.hpp
include/eigenpy/stride.hpp
include/eigenpy/stride.hpp
include/eigenpy/ref.hpp
include/eigenpy/ref.hpp
include/eigenpy/details/rvalue_from_python_data.hpp
)
)
INCLUDE_DIRECTORIES
(
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include
)
INCLUDE_DIRECTORIES
(
${${
PROJECT_NAME
}
_BINARY_DIR
}
/include
)
...
...
This diff is collapsed.
Click to expand it.
include/eigenpy/details.hpp
+
1
−
0
View file @
c4d22398
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
#ifndef __eigenpy_details_hpp__
#ifndef __eigenpy_details_hpp__
#define __eigenpy_details_hpp__
#define __eigenpy_details_hpp__
#include
"eigenpy/details/rvalue_from_python_data.hpp"
#include
"eigenpy/fwd.hpp"
#include
"eigenpy/fwd.hpp"
#include
<patchlevel.h>
// For PY_MAJOR_VERSION
#include
<patchlevel.h>
// For PY_MAJOR_VERSION
...
...
This diff is collapsed.
Click to expand it.
include/eigenpy/details/rvalue_from_python_data.hpp
0 → 100644
+
55
−
0
View file @
c4d22398
#ifndef __eigenpy_details_rvalue_from_python_data_hpp__
#define __eigenpy_details_rvalue_from_python_data_hpp__
#include
<boost/python/converter/rvalue_from_python_data.hpp>
#include
<Eigen/Core>
namespace
boost
{
namespace
python
{
namespace
converter
{
/// \brief Template specialization of rvalue_from_python_data
template
<
typename
Derived
>
struct
rvalue_from_python_data
<
Eigen
::
MatrixBase
<
Derived
>
const
&
>
:
rvalue_from_python_storage
<
Eigen
::
MatrixBase
<
Derived
>
const
&
>
{
typedef
Eigen
::
MatrixBase
<
Derived
>
const
&
T
;
# if (!defined(__MWERKS__) || __MWERKS__ >= 0x3000) \
&& (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= 245) \
&& (!defined(__DECCXX_VER) || __DECCXX_VER > 60590014) \
&& !defined(BOOST_PYTHON_SYNOPSIS)
/* Synopsis' OpenCXX has trouble parsing this */
// This must always be a POD struct with m_data its first member.
BOOST_STATIC_ASSERT
(
BOOST_PYTHON_OFFSETOF
(
rvalue_from_python_storage
<
T
>
,
stage1
)
==
0
);
# endif
// The usual constructor
rvalue_from_python_data
(
rvalue_from_python_stage1_data
const
&
_stage1
)
{
this
->
stage1
=
_stage1
;
}
// This constructor just sets m_convertible -- used by
// implicitly_convertible<> to perform the final step of the
// conversion, where the construct() function is already known.
rvalue_from_python_data
(
void
*
convertible
)
{
this
->
stage1
.
convertible
=
convertible
;
}
// Destroys any object constructed in the storage.
~
rvalue_from_python_data
()
{
if
(
this
->
stage1
.
convertible
==
this
->
storage
.
bytes
)
static_cast
<
Derived
*>
((
void
*
)
this
->
storage
.
bytes
)
->~
Derived
();
}
};
}
}
}
// namespace boost::python::converter
#endif // ifndef __eigenpy_details_rvalue_from_python_data_hpp__
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment