bos #26616 [CEA][Windows] type long MEDCOUPLING failing test: attempt 2

diff --git a/src/INTERP_KERNEL/MCIdType.hxx b/src/INTERP_KERNEL/MCIdType.hxx
index 54d83f37122df6fb084cd871ee82d2eb2c0a66c0..522aba0a8d48a2236e5a28381c76872a7bf452e9 100644 (file)
--- a/src/INTERP_KERNEL/MCIdType.hxx
+++ b/src/INTERP_KERNEL/MCIdType.hxx
@@ -36,6 +36,12 @@ typedef std::int64_t mcIdType;
 
 #endif
 
+#ifdef WIN32
+typedef long long mcPyPtrType;
+#else
+typedef long mcPyPtrType;
+#endif
+
 template <class T> inline std::size_t ToSizeT(T val)
 {
   return static_cast<std::size_t>(val);

diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i
index 1639e0751e394a059ab6de26b5abeb3a058562e9..ca7e739462a6ff5de0d77d41ddd2d3af8b1be409 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingCommon.i
+++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i
@@ -85,7 +85,11 @@ typedef long int mcIdType;
 #endif
 %template(i32vec) std::vector<int>;
 #endif
-
+#ifdef WIN32
+typedef long long mcPyPtrType;
+#else
+typedef long mcPyPtrType;
+#endif
 
 ////////////////////
 %typemap(out) MEDCoupling::MEDCouplingMesh*

diff --git a/src/MEDCoupling_Swig/MEDCouplingMemArray.i b/src/MEDCoupling_Swig/MEDCouplingMemArray.i
index 6afd214c3aac200df47cd39865dfdc0cb69104c5..d9433441aa3381a98e48f861091e465e600e427f 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingMemArray.i
+++ b/src/MEDCoupling_Swig/MEDCouplingMemArray.i
@@ -3706,7 +3706,7 @@ typedef DataArrayInt64 DataArrayIdType;
 
 %inline
 {
-  MEDCoupling::DataArrayByte *FromPyIntPtrToDataArrayByte(long intPtr)
+  MEDCoupling::DataArrayByte *FromPyIntPtrToDataArrayByte(mcPyPtrType intPtr)
   {
     MEDCoupling::DataArrayByte *ret(reinterpret_cast<MEDCoupling::DataArrayByte *>(intPtr));
     return ret;