Salome HOME
projects
/
modules
/
med.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On MD10 32 bits OS the size of objects is smaller than in 64 bits
[modules/med.git]
/
src
/
MEDCoupling_Swig
/
MEDCouplingTypemaps.i
diff --git
a/src/MEDCoupling_Swig/MEDCouplingTypemaps.i
b/src/MEDCoupling_Swig/MEDCouplingTypemaps.i
index ace73d10434af40a1d500c2a84755712ce3f5cec..af711aadd4885987f5a48a7e247d540c9cbab280 100644
(file)
--- a/
src/MEDCoupling_Swig/MEDCouplingTypemaps.i
+++ b/
src/MEDCoupling_Swig/MEDCouplingTypemaps.i
@@
-212,13
+212,13
@@
MCData *BuildNewInstance(PyObject *elt0, int npyObjectType, PyTypeObject *pytype
throw INTERP_KERNEL::Exception("Input numpy array should have dimension equal to 1 or 2 !");
if(PyArray_ObjectType(elt0,0)!=npyObjectType)
{
throw INTERP_KERNEL::Exception("Input numpy array should have dimension equal to 1 or 2 !");
if(PyArray_ObjectType(elt0,0)!=npyObjectType)
{
- std::ostringstream oss; oss << "Input numpy array has not
of
type " << msg << " at component #0 !";
+ std::ostringstream oss; oss << "Input numpy array has not
the
type " << msg << " at component #0 !";
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
if(ndim==2)
if(PyArray_ObjectType(elt0,1)!=npyObjectType)
{
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
if(ndim==2)
if(PyArray_ObjectType(elt0,1)!=npyObjectType)
{
- std::ostringstream oss; oss << "Input numpy array has not
of
type " << msg << " at component #1 !";
+ std::ostringstream oss; oss << "Input numpy array has not
the
type " << msg << " at component #1 !";
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
npy_intp sz0=PyArray_DIM(elt0,0);
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
npy_intp sz0=PyArray_DIM(elt0,0);
@@
-1125,7
+1125,10
@@
static void convertFromPyObjVectorOfObj(PyObject *pyLi, swig_type_info *ty, cons
PyObject *obj=PyList_GetItem(pyLi,i);
int status=SWIG_ConvertPtr(obj,&argp,ty,0|0);
if(!SWIG_IsOK(status))
PyObject *obj=PyList_GetItem(pyLi,i);
int status=SWIG_ConvertPtr(obj,&argp,ty,0|0);
if(!SWIG_IsOK(status))
- throw INTERP_KERNEL::Exception("list must contain only MEDCouplingUMesh");
+ {
+ std::ostringstream oss; oss << "convertFromPyObjVectorOfObj : list is excepted to contain only " << typeStr << " instances !";
+ throw INTERP_KERNEL::Exception(oss.str().c_str());
+ }
T arg=reinterpret_cast< T >(argp);
ret[i]=arg;
}
T arg=reinterpret_cast< T >(argp);
ret[i]=arg;
}
@@
-1140,7
+1143,7
@@
static void convertFromPyObjVectorOfObj(PyObject *pyLi, swig_type_info *ty, cons
int status=SWIG_ConvertPtr(obj,&argp,ty,0|0);
if(!SWIG_IsOK(status))
{
int status=SWIG_ConvertPtr(obj,&argp,ty,0|0);
if(!SWIG_IsOK(status))
{
- std::ostringstream oss; oss << "
tuple must contain only " << typeStr
;
+ std::ostringstream oss; oss << "
convertFromPyObjVectorOfObj : tuple is excepted to contain only " << typeStr << " instances !"
;
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
T arg=reinterpret_cast< T >(argp);
throw INTERP_KERNEL::Exception(oss.str().c_str());
}
T arg=reinterpret_cast< T >(argp);