From 4995d7f15517a660c2376e7171359912c1309a8a Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Thu, 28 May 2020 11:21:16 +0200
Subject: [PATCH] core: change for DLLAPI to generic export/import
---
include/eigenpy/computation-info.hpp | 2 +-
.../eigenpy/decompositions/decompositions.hpp | 2 +-
include/eigenpy/eigenpy.hpp | 2 +-
include/eigenpy/geometry.hpp | 6 +++---
include/eigenpy/numpy-type.hpp | 2 +-
include/eigenpy/numpy.hpp | 20 +++++++++----------
include/eigenpy/register.hpp | 2 +-
include/eigenpy/solvers/preconditioners.hpp | 2 +-
include/eigenpy/solvers/solvers.hpp | 2 +-
include/eigenpy/version.hpp | 4 ++--
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/eigenpy/computation-info.hpp b/include/eigenpy/computation-info.hpp
index b5d33782..b610401b 100644
--- a/include/eigenpy/computation-info.hpp
+++ b/include/eigenpy/computation-info.hpp
@@ -12,7 +12,7 @@
namespace eigenpy
{
- inline void EIGENPY_DLLEXPORT exposeComputationInfo()
+ inline void EIGENPY_DLLAPI exposeComputationInfo()
{
boost::python::enum_<Eigen::ComputationInfo>("ComputationInfo")
.value("Success",Eigen::Success)
diff --git a/include/eigenpy/decompositions/decompositions.hpp b/include/eigenpy/decompositions/decompositions.hpp
index 27793784..9151a8a1 100644
--- a/include/eigenpy/decompositions/decompositions.hpp
+++ b/include/eigenpy/decompositions/decompositions.hpp
@@ -9,7 +9,7 @@
namespace eigenpy
{
- void EIGENPY_DLLEXPORT exposeDecompositions();
+ void EIGENPY_DLLAPI exposeDecompositions();
} // namespace eigenpy
#endif // define __eigenpy_decompositions_decompositions_hpp__
diff --git a/include/eigenpy/eigenpy.hpp b/include/eigenpy/eigenpy.hpp
index 304b01b0..49544cca 100644
--- a/include/eigenpy/eigenpy.hpp
+++ b/include/eigenpy/eigenpy.hpp
@@ -40,7 +40,7 @@ namespace eigenpy
{
/* Enable Eigen-Numpy serialization for a set of standard MatrixBase instance. */
- void EIGENPY_DLLEXPORT enableEigenPy();
+ void EIGENPY_DLLAPI enableEigenPy();
/* Enable the Eigen--Numpy serialization for the templated MatrixBase class.
* The second template argument is used for inheritance of Eigen classes. If
diff --git a/include/eigenpy/geometry.hpp b/include/eigenpy/geometry.hpp
index 3fee5f3a..b34ac493 100644
--- a/include/eigenpy/geometry.hpp
+++ b/include/eigenpy/geometry.hpp
@@ -11,10 +11,10 @@
namespace eigenpy
{
- void EIGENPY_DLLEXPORT exposeQuaternion();
- void EIGENPY_DLLEXPORT exposeAngleAxis();
+ void EIGENPY_DLLAPI exposeQuaternion();
+ void EIGENPY_DLLAPI exposeAngleAxis();
- void EIGENPY_DLLEXPORT exposeGeometryConversion();
+ void EIGENPY_DLLAPI exposeGeometryConversion();
} // namespace eigenpy
diff --git a/include/eigenpy/numpy-type.hpp b/include/eigenpy/numpy-type.hpp
index a431c1e7..c9bccd77 100644
--- a/include/eigenpy/numpy-type.hpp
+++ b/include/eigenpy/numpy-type.hpp
@@ -72,7 +72,7 @@ namespace eigenpy
ARRAY_TYPE
};
- struct EIGENPY_DLLEXPORT NumpyType
+ struct EIGENPY_DLLAPI NumpyType
{
static NumpyType & getInstance();
diff --git a/include/eigenpy/numpy.hpp b/include/eigenpy/numpy.hpp
index b0de2648..0389f529 100644
--- a/include/eigenpy/numpy.hpp
+++ b/include/eigenpy/numpy.hpp
@@ -30,28 +30,28 @@
namespace eigenpy
{
- void EIGENPY_DLLEXPORT import_numpy();
- int EIGENPY_DLLEXPORT PyArray_TypeNum(PyTypeObject * type);
+ void EIGENPY_DLLAPI import_numpy();
+ int EIGENPY_DLLAPI PyArray_TypeNum(PyTypeObject * type);
}
#if defined _WIN32 || defined __CYGWIN__
namespace eigenpy
{
- EIGENPY_DLLEXPORT bool call_PyArray_Check(PyObject *);
+ EIGENPY_DLLAPI bool call_PyArray_Check(PyObject *);
- EIGENPY_DLLEXPORT PyObject* call_PyArray_SimpleNew(int nd, npy_intp * shape, int np_type);
+ EIGENPY_DLLAPI PyObject* call_PyArray_SimpleNew(int nd, npy_intp * shape, int np_type);
- EIGENPY_DLLEXPORT PyObject* call_PyArray_New(PyTypeObject * py_type_ptr, int nd, npy_intp * shape, int np_type, void * data_ptr, int options);
+ EIGENPY_DLLAPI PyObject* call_PyArray_New(PyTypeObject * py_type_ptr, int nd, npy_intp * shape, int np_type, void * data_ptr, int options);
- EIGENPY_DLLEXPORT int call_PyArray_ObjectType(PyObject *, int);
+ EIGENPY_DLLAPI int call_PyArray_ObjectType(PyObject *, int);
- EIGENPY_DLLEXPORT PyTypeObject * getPyArrayType();
+ EIGENPY_DLLAPI PyTypeObject * getPyArrayType();
- EIGENPY_DLLEXPORT PyArray_Descr * call_PyArray_DescrFromType(int typenum);
+ EIGENPY_DLLAPI PyArray_Descr * call_PyArray_DescrFromType(int typenum);
- EIGENPY_DLLEXPORT void call_PyArray_InitArrFuncs(PyArray_ArrFuncs * funcs);
+ EIGENPY_DLLAPI void call_PyArray_InitArrFuncs(PyArray_ArrFuncs * funcs);
- EIGENPY_DLLEXPORT int call_PyArray_RegisterDataType(PyArray_Descr * dtype);
+ EIGENPY_DLLAPI int call_PyArray_RegisterDataType(PyArray_Descr * dtype);
}
#else
#define call_PyArray_Check(py_obj) PyArray_Check(py_obj)
diff --git a/include/eigenpy/register.hpp b/include/eigenpy/register.hpp
index c6bc39c4..58bb770a 100644
--- a/include/eigenpy/register.hpp
+++ b/include/eigenpy/register.hpp
@@ -18,7 +18,7 @@ namespace eigenpy
{
/// \brief Structure collecting all the types registers in Numpy via EigenPy
- struct EIGENPY_DLLEXPORT Register
+ struct EIGENPY_DLLAPI Register
{
static PyArray_Descr * getPyArrayDescr(PyTypeObject * py_type_ptr);
diff --git a/include/eigenpy/solvers/preconditioners.hpp b/include/eigenpy/solvers/preconditioners.hpp
index 46540d2a..0f86860d 100644
--- a/include/eigenpy/solvers/preconditioners.hpp
+++ b/include/eigenpy/solvers/preconditioners.hpp
@@ -22,7 +22,7 @@
namespace eigenpy
{
- void EIGENPY_DLLEXPORT exposePreconditioners();
+ void EIGENPY_DLLAPI exposePreconditioners();
} // namespace eigenpy
diff --git a/include/eigenpy/solvers/solvers.hpp b/include/eigenpy/solvers/solvers.hpp
index b85a3921..3c3cac5e 100644
--- a/include/eigenpy/solvers/solvers.hpp
+++ b/include/eigenpy/solvers/solvers.hpp
@@ -11,7 +11,7 @@ namespace eigenpy
{
struct SolversScope {};
- void EIGENPY_DLLEXPORT exposeSolvers();
+ void EIGENPY_DLLAPI exposeSolvers();
} // namespace eigenpy
diff --git a/include/eigenpy/version.hpp b/include/eigenpy/version.hpp
index 10c3ba2f..67c810a7 100644
--- a/include/eigenpy/version.hpp
+++ b/include/eigenpy/version.hpp
@@ -17,7 +17,7 @@ namespace eigenpy
/// the following standard:
/// EIGENPY_MINOR_VERSION.EIGENPY_MINOR_VERSION.EIGENPY_PATCH_VERSION
///
- std::string EIGENPY_DLLEXPORT printVersion(const std::string & delimiter = ".");
+ std::string EIGENPY_DLLAPI 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_DLLEXPORT checkVersionAtLeast(unsigned int major_version,
+ bool EIGENPY_DLLAPI checkVersionAtLeast(unsigned int major_version,
unsigned int minor_version,
unsigned int patch_version);
}
--
GitLab