From: vsr Date: Wed, 10 Nov 2021 17:20:59 +0000 (+0300) Subject: Revert "bos #26616 [CEA][Windows] type long MEDCOUPLING failing test" X-Git-Tag: V9_8_0rc1~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f03dfed4c3ff3288e77fa03e8b2de0bf912cf238;p=tools%2Fmedcoupling.git Revert "bos #26616 [CEA][Windows] type long MEDCOUPLING failing test" This reverts commit 6712a95b385dfb8db6ab119dd2cc0da77f063142. --- diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i index ca7e73946..1639e0751 100644 --- a/src/MEDCoupling_Swig/MEDCouplingCommon.i +++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i @@ -85,11 +85,7 @@ typedef long int mcIdType; #endif %template(i32vec) std::vector; #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 d9433441a..6afd214c3 100644 --- a/src/MEDCoupling_Swig/MEDCouplingMemArray.i +++ b/src/MEDCoupling_Swig/MEDCouplingMemArray.i @@ -3706,7 +3706,7 @@ typedef DataArrayInt64 DataArrayIdType; %inline { - MEDCoupling::DataArrayByte *FromPyIntPtrToDataArrayByte(mcPyPtrType intPtr) + MEDCoupling::DataArrayByte *FromPyIntPtrToDataArrayByte(long intPtr) { MEDCoupling::DataArrayByte *ret(reinterpret_cast(intPtr)); return ret;