#30278 [CEA][Windows] PY2CPP compilation issue

diff --git a/src/Result.hxx b/src/Result.hxx
index f2f9c6ffc28e3e8699952dc4afd8b936e119b42f..9a89a0e622e85c030dc34738fd0ad8169f5976b9 100644 (file)
--- a/src/Result.hxx
+++ b/src/Result.hxx
@@ -28,7 +28,7 @@ namespace py2cpp
 {
 
 template<class ...Ts>
-class PY2CPP_EXPORT Result;
+class Result;
 
 /*! class Result is used by pyResult function for syntax sugar purpose.
  * You can write this:
@@ -58,7 +58,7 @@ class PY2CPP_EXPORT Result;
  *     std::cerr << py2cpp::getLastPyError();
  **/
 template<>
-class PY2CPP_EXPORT Result<>
+class Result<>
 {
 public:
   void operator=(PyObject * po)
@@ -70,7 +70,7 @@ public:
 };
 
 template<class T>
-class PY2CPP_EXPORT Result<T>
+class Result<T>
 {
 public:
   Result() = delete;
@@ -92,7 +92,7 @@ private:
 };
 
 template<class ...Ts>
-class PY2CPP_EXPORT Result
+class Result
 {
 public:
   Result() = delete;
@@ -112,7 +112,7 @@ private:
 };
 
 template<class ...Ts>
-PY2CPP_EXPORT Result<Ts...> pyResult(Ts&... args)
+Result<Ts...> pyResult(Ts&... args)
 {
   return Result<Ts...>(args...);
 }

diff --git a/src/TypeConversions.hxx b/src/TypeConversions.hxx
index 8575ce68d2228098a14b71d93b3fb3ea39458cad..9f588448478cec615c26a06cd3dcf3e66761a871 100644 (file)
--- a/src/TypeConversions.hxx
+++ b/src/TypeConversions.hxx
@@ -110,7 +110,7 @@ addInPyTuple(PyObject * result, const std::tuple<Ts...>& vars )
 }
 
 template<class ...Ts>
-PY2CPP_EXPORT PyObject * toPy(const std::tuple<Ts...>& vars )
+PyObject * toPy(const std::tuple<Ts...>& vars )
 {
   PyObject * result = PyTuple_New(sizeof...(Ts));
   addInPyTuple<0, Ts... >(result, vars);
@@ -119,7 +119,7 @@ PY2CPP_EXPORT PyObject * toPy(const std::tuple<Ts...>& vars )
 
 // std containers
 template <class T>
-PY2CPP_EXPORT PyObject * toPy(const std::vector<T>& values)
+PyObject * toPy(const std::vector<T>& 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<T>& values)
 }
 
 template <class T>
-PY2CPP_EXPORT PyObject * toPy(const std::list<T>& values)
+PyObject * toPy(const std::list<T>& values)
 {
   PyObject * result = PyList_New(values.size());
   std::size_t i = 0;
@@ -141,7 +141,7 @@ PY2CPP_EXPORT PyObject * toPy(const std::list<T>& values)
 }
 
 template <class K, class V>
-PY2CPP_EXPORT PyObject * toPy(const std::map<K, V>& values)
+PyObject * toPy(const std::map<K, V>& values)
 {
   PyObject * result = PyDict_New();
   for(const auto& it: values)
@@ -174,7 +174,7 @@ getFromPyTuple(PyObject * tup, std::tuple<Ts&...>& vars )
 }
 
 template<class ...Ts>
-PY2CPP_EXPORT ConversionCheck fromPy(PyObject * obj, std::tuple<Ts&...>& vars)
+ConversionCheck fromPy(PyObject * obj, std::tuple<Ts&...>& vars)
 {
   ConversionCheck check;
   if(obj)
@@ -198,7 +198,7 @@ PY2CPP_EXPORT ConversionCheck fromPy(PyObject * obj, std::tuple<Ts&...>& vars)
 }
 
 template <class T>
-PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::vector<T>& result)
+ConversionCheck fromPy( PyObject *obj, std::vector<T>& result)
 {
   ConversionCheck check;
   if(PyList_Check(obj))
@@ -227,7 +227,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::vector<T>& result)
 }
 
 template <class T>
-PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::list<T>& result)
+ConversionCheck fromPy( PyObject *obj, std::list<T>& result)
 {
   ConversionCheck check;
   if(PyList_Check(obj))
@@ -270,7 +270,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::list<T>& result)
 }
 
 template <class K, class V>
-PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::map<K, V>& result)
+ConversionCheck fromPy( PyObject *obj, std::map<K, V>& result)
 {
   ConversionCheck check;
   if(PyDict_Check(obj))
@@ -299,7 +299,7 @@ PY2CPP_EXPORT ConversionCheck fromPy( PyObject *obj, std::map<K, V>& result)
 
 // PyPtr
 template<class T>
-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<class T>
-PY2CPP_EXPORT ConversionCheck fromPyPtr( const PyPtr& py, T& var)
+ConversionCheck fromPyPtr( const PyPtr& py, T& var)
 {
   return fromPy(py.get(), var);
 }
 
 template<class T>
-PY2CPP_EXPORT PY2CPP_EXPORT PyPtr toPyPtr(const T& v)
+PyPtr toPyPtr(const T& v)
 {
   return PyPtr(toPy(v));
 }
 
 template<class T>
-PY2CPP_EXPORT T fromPy( PyObject *po)
+T fromPy( PyObject *po)
 {
   T result;
   ConversionCheck check;