X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModelAPI%2FModelAPI.i;h=2e70d62c7bfc82de81bba0f7b1613811e14f9dbe;hb=0fdfafcdf2500a8e7e895fca953d7ebfb9126f16;hp=ca786a2a6fb0a7cac7ad45aff0c66110c33ec894;hpb=50a8df0c6a66da8067b16155e5ae39f8f26a7ebc;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i index ca786a2a6..2e70d62c7 100644 --- a/src/ModelAPI/ModelAPI.i +++ b/src/ModelAPI/ModelAPI.i @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -30,8 +30,16 @@ %{ #include "ModelAPI_swig.h" + // fix for SWIG v4.1.1 + #if PY_VERSION_HEX >= 0x03020000 + # define SWIGPY_SLICEOBJECT PyObject + #else + # define SWIGPY_SLICEOBJECT PySliceObject + #endif + // fix for SWIG v2.0.4 - #define SWIGPY_SLICE_ARG(obj) ((PyObject*)(obj)) + #define SWIGPY_SLICE_ARG(obj) ((SWIGPY_SLICEOBJECT*)(obj)) + #define SWIGPY_UNICODE_ARG(obj) ((PyObject*) (obj)) %} // import other modules @@ -42,8 +50,6 @@ #define MODELAPI_EXPORT // standard definitions -%include "typemaps.i" -%include "std_string.i" %include "std_list.i" %include "std_shared_ptr.i" %include "std_set.i" @@ -97,7 +103,6 @@ %shared_ptr(ModelAPI_ResultField) %shared_ptr(ModelAPI_ResultParameter) %shared_ptr(ModelAPI_ResultCompSolid) -%shared_ptr(ModelAPI_ObjectUpdatedMessage) %typecheck(SWIG_TYPECHECK_POINTER) const ModelAPI_AttributeTables::Value { $1 = (PyFloat_Check($input) || PyLong_Check($input) || PyUnicode_Check($input) || PyBool_Check($input)) ? 1 : 0; @@ -197,7 +202,11 @@ template std::shared_ptr shared_ptr_cast(std::shared_ptr %template(modelAPI_ResultGroup) shared_ptr_cast; %template(modelAPI_ResultField) shared_ptr_cast; -%template(messageToUpdatedMessage) shared_ptr_cast; +%inline %{ + ModelAPI_ObjectUpdatedMessage* messageToUpdatedMessage(std::shared_ptr msg) { + return static_cast(msg.get()); + } +%} // Attribute casts %template(modelAPI_AttributeDocRef) shared_ptr_cast;