Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
eigenpy
Commits
4995d7f1
Verified
Commit
4995d7f1
authored
May 28, 2020
by
Justin Carpentier
Browse files
core: change for DLLAPI to generic export/import
parent
f1f6f24f
Changes
10
Hide whitespace changes
Inline
Side-by-side
include/eigenpy/computation-info.hpp
View file @
4995d7f1
...
...
@@ -12,7 +12,7 @@
namespace
eigenpy
{
inline
void
EIGENPY_DLL
EXPORT
exposeComputationInfo
()
inline
void
EIGENPY_DLL
API
exposeComputationInfo
()
{
boost
::
python
::
enum_
<
Eigen
::
ComputationInfo
>
(
"ComputationInfo"
)
.
value
(
"Success"
,
Eigen
::
Success
)
...
...
include/eigenpy/decompositions/decompositions.hpp
View file @
4995d7f1
...
...
@@ -9,7 +9,7 @@
namespace
eigenpy
{
void
EIGENPY_DLL
EXPORT
exposeDecompositions
();
void
EIGENPY_DLL
API
exposeDecompositions
();
}
// namespace eigenpy
#endif // define __eigenpy_decompositions_decompositions_hpp__
include/eigenpy/eigenpy.hpp
View file @
4995d7f1
...
...
@@ -40,7 +40,7 @@ namespace eigenpy
{
/* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
void
EIGENPY_DLL
EXPORT
enableEigenPy
();
void
EIGENPY_DLL
API
enableEigenPy
();
/* Enable the Eigen--Numpy serialization for the templated MatrixBase class.
* The second template argument is used for inheritance of Eigen classes. If
...
...
include/eigenpy/geometry.hpp
View file @
4995d7f1
...
...
@@ -11,10 +11,10 @@
namespace
eigenpy
{
void
EIGENPY_DLL
EXPORT
exposeQuaternion
();
void
EIGENPY_DLL
EXPORT
exposeAngleAxis
();
void
EIGENPY_DLL
API
exposeQuaternion
();
void
EIGENPY_DLL
API
exposeAngleAxis
();
void
EIGENPY_DLL
EXPORT
exposeGeometryConversion
();
void
EIGENPY_DLL
API
exposeGeometryConversion
();
}
// namespace eigenpy
...
...
include/eigenpy/numpy-type.hpp
View file @
4995d7f1
...
...
@@ -72,7 +72,7 @@ namespace eigenpy
ARRAY_TYPE
};
struct
EIGENPY_DLL
EXPORT
NumpyType
struct
EIGENPY_DLL
API
NumpyType
{
static
NumpyType
&
getInstance
();
...
...
include/eigenpy/numpy.hpp
View file @
4995d7f1
...
...
@@ -30,28 +30,28 @@
namespace
eigenpy
{
void
EIGENPY_DLL
EXPORT
import_numpy
();
int
EIGENPY_DLL
EXPORT
PyArray_TypeNum
(
PyTypeObject
*
type
);
void
EIGENPY_DLL
API
import_numpy
();
int
EIGENPY_DLL
API
PyArray_TypeNum
(
PyTypeObject
*
type
);
}
#if defined _WIN32 || defined __CYGWIN__
namespace
eigenpy
{
EIGENPY_DLL
EXPORT
bool
call_PyArray_Check
(
PyObject
*
);
EIGENPY_DLL
API
bool
call_PyArray_Check
(
PyObject
*
);
EIGENPY_DLL
EXPORT
PyObject
*
call_PyArray_SimpleNew
(
int
nd
,
npy_intp
*
shape
,
int
np_type
);
EIGENPY_DLL
API
PyObject
*
call_PyArray_SimpleNew
(
int
nd
,
npy_intp
*
shape
,
int
np_type
);
EIGENPY_DLL
EXPORT
PyObject
*
call_PyArray_New
(
PyTypeObject
*
py_type_ptr
,
int
nd
,
npy_intp
*
shape
,
int
np_type
,
void
*
data_ptr
,
int
options
);
EIGENPY_DLL
API
PyObject
*
call_PyArray_New
(
PyTypeObject
*
py_type_ptr
,
int
nd
,
npy_intp
*
shape
,
int
np_type
,
void
*
data_ptr
,
int
options
);
EIGENPY_DLL
EXPORT
int
call_PyArray_ObjectType
(
PyObject
*
,
int
);
EIGENPY_DLL
API
int
call_PyArray_ObjectType
(
PyObject
*
,
int
);
EIGENPY_DLL
EXPORT
PyTypeObject
*
getPyArrayType
();
EIGENPY_DLL
API
PyTypeObject
*
getPyArrayType
();
EIGENPY_DLL
EXPORT
PyArray_Descr
*
call_PyArray_DescrFromType
(
int
typenum
);
EIGENPY_DLL
API
PyArray_Descr
*
call_PyArray_DescrFromType
(
int
typenum
);
EIGENPY_DLL
EXPORT
void
call_PyArray_InitArrFuncs
(
PyArray_ArrFuncs
*
funcs
);
EIGENPY_DLL
API
void
call_PyArray_InitArrFuncs
(
PyArray_ArrFuncs
*
funcs
);
EIGENPY_DLL
EXPORT
int
call_PyArray_RegisterDataType
(
PyArray_Descr
*
dtype
);
EIGENPY_DLL
API
int
call_PyArray_RegisterDataType
(
PyArray_Descr
*
dtype
);
}
#else
#define call_PyArray_Check(py_obj) PyArray_Check(py_obj)
...
...
include/eigenpy/register.hpp
View file @
4995d7f1
...
...
@@ -18,7 +18,7 @@ namespace eigenpy
{
/// \brief Structure collecting all the types registers in Numpy via EigenPy
struct
EIGENPY_DLL
EXPORT
Register
struct
EIGENPY_DLL
API
Register
{
static
PyArray_Descr
*
getPyArrayDescr
(
PyTypeObject
*
py_type_ptr
);
...
...
include/eigenpy/solvers/preconditioners.hpp
View file @
4995d7f1
...
...
@@ -22,7 +22,7 @@
namespace
eigenpy
{
void
EIGENPY_DLL
EXPORT
exposePreconditioners
();
void
EIGENPY_DLL
API
exposePreconditioners
();
}
// namespace eigenpy
...
...
include/eigenpy/solvers/solvers.hpp
View file @
4995d7f1
...
...
@@ -11,7 +11,7 @@ namespace eigenpy
{
struct
SolversScope
{};
void
EIGENPY_DLL
EXPORT
exposeSolvers
();
void
EIGENPY_DLL
API
exposeSolvers
();
}
// namespace eigenpy
...
...
include/eigenpy/version.hpp
View file @
4995d7f1
...
...
@@ -17,7 +17,7 @@ namespace eigenpy
/// the following standard:
/// EIGENPY_MINOR_VERSION.EIGENPY_MINOR_VERSION.EIGENPY_PATCH_VERSION
///
std
::
string
EIGENPY_DLL
EXPORT
printVersion
(
const
std
::
string
&
delimiter
=
"."
);
std
::
string
EIGENPY_DLL
API
printVersion
(
const
std
::
string
&
delimiter
=
"."
);
///
/// \brief Checks if the current version of EigenPy is at least the version provided
...
...
@@ -30,7 +30,7 @@ namespace eigenpy
/// \returns true if the current version of EigenPy is greater than the version provided
/// by the input arguments.
///
bool
EIGENPY_DLL
EXPORT
checkVersionAtLeast
(
unsigned
int
major_version
,
bool
EIGENPY_DLL
API
checkVersionAtLeast
(
unsigned
int
major_version
,
unsigned
int
minor_version
,
unsigned
int
patch_version
);
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment