Unverified Commit fb697392 authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub

Merge pull request #194 from jcarpent/devel

Fix Windows export
parents 4a699bc5 e3a798ef
......@@ -12,7 +12,7 @@
namespace eigenpy
{
inline void EIGENPY_DLLEXPORT exposeComputationInfo()
inline void exposeComputationInfo()
{
boost::python::enum_<Eigen::ComputationInfo>("ComputationInfo")
.value("Success",Eigen::Success)
......
......@@ -9,7 +9,7 @@
namespace eigenpy
{
void EIGENPY_DLLEXPORT exposeDecompositions();
void EIGENPY_DLLAPI exposeDecompositions();
} // namespace eigenpy
#endif // define __eigenpy_decompositions_decompositions_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
......
......@@ -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
......
......@@ -72,7 +72,7 @@ namespace eigenpy
ARRAY_TYPE
};
struct EIGENPY_DLLEXPORT NumpyType
struct EIGENPY_DLLAPI NumpyType
{
static NumpyType & getInstance();
......
......@@ -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)
......
......@@ -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);
......
......@@ -22,7 +22,7 @@
namespace eigenpy
{
void EIGENPY_DLLEXPORT exposePreconditioners();
void EIGENPY_DLLAPI exposePreconditioners();
} // namespace eigenpy
......
......@@ -11,7 +11,7 @@ namespace eigenpy
{
struct SolversScope {};
void EIGENPY_DLLEXPORT exposeSolvers();
void EIGENPY_DLLAPI exposeSolvers();
} // namespace eigenpy
......
......@@ -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);
}
......
<?xml version="1.0"?>
<package format="3">
<name>eigenpy</name>
<version>2.4.0</version>
<version>2.4.1</version>
<description>Bindings between Numpy and Eigen using Boost.Python</description>
<maintainer email="justin.carpentier@inria.fr">Justin Carpentier</maintainer>
<maintainer email="wolfgang.merkt@ed.ac.uk">Wolfgang Merkt</maintainer>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment