jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #1300 clang warning in SWIG_Python_ConvertPtrAndOwn.

Browse source
This commit is contained in:
Michel Zou 2013-02-22 10:11:50 +01:00
commit 8e340c158c
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/python/pyrun.swg
View file

@ -1231,10 +1231,10 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int
*ptr = vptr; *ptr = vptr;
/* transfer the ownership to 'ptr' */ /* transfer the ownership to 'ptr' */
iobj->own = 0; iobj->own = 0;
res = SWIG_AddCast(res); SWIG_AddCastInplace(&res);
res = SWIG_AddNewMask(res); res = SWIG_AddNewMask(res);
} else { } else {
res = SWIG_AddCast(res); SWIG_AddCastInplace(&res);
} }
} }
} }

11
Lib/swigrun.swg
View file

@ -161,13 +161,20 @@
# endif # endif
# define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1) # define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1)
# define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK) # define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK)
SWIGINTERNINLINE int SWIG_AddCast(int r) { SWIGINTERNINLINE int SWIG_AddCastInplace(int *r) {
return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r; if (SWIG_IsOK(*r)) {
*r = (SWIG_CastRank(*r) < SWIG_MAXCASTRANK) ? (*r + 1) : SWIG_ERROR;
}
}
SWIGINTERNINLINE int SWIG_AddCast(int r) {
SWIG_AddCastInplace(&r);
return r;
} }
SWIGINTERNINLINE int SWIG_CheckState(int r) { SWIGINTERNINLINE int SWIG_CheckState(int r) {
return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
} }
#else /* no cast-rank mode */ #else /* no cast-rank mode */
# define SWIG_AddCastInplace(r)
# define SWIG_AddCast # define SWIG_AddCast
# define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0) # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
#endif #endif