X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTypeConversions.hxx;fp=src%2FTypeConversions.hxx;h=9f588448478cec615c26a06cd3dcf3e66761a871;hb=1712c53f23ce6186af3137dd687381c6faf6cf80;hp=8575ce68d2228098a14b71d93b3fb3ea39458cad;hpb=5686ffb4dc3a78e3a828ff4adb2c0b5860ea1195;p=tools%2Fpy2cpp.git diff --git a/src/TypeConversions.hxx b/src/TypeConversions.hxx index 8575ce6..9f58844 100644 --- a/src/TypeConversions.hxx +++ b/src/TypeConversions.hxx @@ -110,7 +110,7 @@ addInPyTuple(PyObject * result, const std::tuple& vars ) } template -PY2CPP_EXPORT PyObject * toPy(const std::tuple& vars ) +PyObject * toPy(const std::tuple& vars ) { PyObject * result = PyTuple_New(sizeof...(Ts)); addInPyTuple<0, Ts... >(result, vars); @@ -119,7 +119,7 @@ PY2CPP_EXPORT PyObject * toPy(const std::tuple& vars ) // std containers template -PY2CPP_EXPORT PyObject * toPy(const std::vector& values) +PyObject * toPy(const std::vector& values) { PyObject * result = PyList_New(values.size()); for(std::size_t i = 0; i < values.size(); ++i) @@ -128,7 +128,7 @@ PY2CPP_EXPORT PyObject * toPy(const std::vector& values) } template -PY2CPP_EXPORT PyObject * toPy(const std::list& values) +PyObject * toPy(const std::list& values) { PyObject * result = PyList_New(values.size()); std::size_t i = 0; @@ -141,7 +141,7 @@ PY2CPP_EXPORT PyObject * toPy(const std::list& values) } template -PY2CPP_EXPORT PyObject * toPy(const std::map& values) +PyObject * toPy(const std::map& values) { PyObject * result = PyDict_New(); for(const auto& it: values) @@ -174,7 +174,7 @@ getFromPyTuple(PyObject * tup, std::tuple& vars ) } template -PY2CPP_EXPORT ConversionCheck fromPy(PyObject * obj, std::tuple& vars) +ConversionCheck fromPy(PyObject * obj, std::tuple& vars) { ConversionCheck check; if(obj) @@ -198,7 +198,7 @@ PY2CPP_EXPORT ConversionCheck fromPy(PyObject * obj, std::tuple& vars) } template -PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::vector& result) +ConversionCheck fromPy( PyObject *obj, std::vector& result) { ConversionCheck check; if(PyList_Check(obj)) @@ -227,7 +227,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::vector& result) } template -PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::list& result) +ConversionCheck fromPy( PyObject *obj, std::list& result) { ConversionCheck check; if(PyList_Check(obj)) @@ -270,7 +270,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::list& result) } template -PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::map& result) +ConversionCheck fromPy( PyObject *obj, std::map& result) { ConversionCheck check; if(PyDict_Check(obj)) @@ -299,7 +299,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::map& result) // PyPtr template -PY2CPP_EXPORT T fromPyPtr( const PyPtr& py) +T fromPyPtr( const PyPtr& py) { T result; fromPy(py.get(), result); @@ -307,19 +307,19 @@ PY2CPP_EXPORT T fromPyPtr( const PyPtr& py) } template -PY2CPP_EXPORT ConversionCheck fromPyPtr( const PyPtr& py, T& var) +ConversionCheck fromPyPtr( const PyPtr& py, T& var) { return fromPy(py.get(), var); } template -PY2CPP_EXPORT PY2CPP_EXPORT PyPtr toPyPtr(const T& v) +PyPtr toPyPtr(const T& v) { return PyPtr(toPy(v)); } template -PY2CPP_EXPORT T fromPy( PyObject *po) +T fromPy( PyObject *po) { T result; ConversionCheck check;