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

use better names to avoid clashing with directors, as reported by Eric Blossom

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9038 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-03-27 21:20:46 +00:00
commit e28dacf28d
3 changed files with 70 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Lib/typemaps/ptrtypes.swg
View file

@ -70,35 +70,35 @@
%define %ptr_directorout_typemap(asptr_meth,frag,Type...)
%typemap(directorargout,noblock=1,fragment=frag) Type *DIRECTOROUT ($*ltype temp) {
Type *optr = 0;
int ores = $input ? asptr_meth($input, &optr) : 0;
if (!SWIG_IsOK(ores) || !optr) {
%dirout_fail((optr ? ores : SWIG_TypeError),"$type");
Type *swig_optr = 0;
int swig_ores = $input ? asptr_meth($input, &swig_optr) : 0;
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
%dirout_fail((swig_optr ? swig_ores : SWIG_TypeError),"$type");
}
temp = *optr;
temp = *swig_optr;
$result = &temp;
if (SWIG_IsNewObj(ores)) %delete(optr);
if (SWIG_IsNewObj(swig_ores)) %delete(swig_optr);
}
%typemap(directorout,noblock=1,fragment=frag) Type {
Type *optr = 0;
int ores = asptr_meth($input, &optr);
if (!SWIG_IsOK(ores) || !optr) {
%dirout_fail((optr ? ores : SWIG_TypeError),"$type");
Type *swig_optr = 0;
int swig_ores = asptr_meth($input, &swig_optr);
if (!SWIG_IsOK(swig_ores) || !swig_optr) {
%dirout_fail((swig_optr ? swig_ores : SWIG_TypeError),"$type");
}
$result = *optr;
if (SWIG_IsNewObj(ores)) %delete(optr);
$result = *swig_optr;
if (SWIG_IsNewObj(swig_ores)) %delete(swig_optr);
}
%typemap(directorout,noblock=1,fragment=frag,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Type* {
Type *optr = 0;
int ores = asptr_meth($input, &optr);
if (!SWIG_IsOK(ores)) {
%dirout_fail(ores,"$type");
Type *swig_optr = 0;
int swig_ores = asptr_meth($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
%dirout_fail(swig_ores,"$type");
}
$result = optr;
if (SWIG_IsNewObj(ores)) {
swig_acquire_ownership(optr);
$result = swig_optr;
if (SWIG_IsNewObj(swig_ores)) {
swig_acquire_ownership(swig_optr);
}
}
%typemap(directorfree,noblock=1) Type*
@ -109,18 +109,18 @@
}
%typemap(directorout,noblock=1,fragment=frag,warning=SWIGWARN_TYPEMAP_DIRECTOROUT_PTR_MSG) Type& {
Type *optr = 0;
int ores = asptr_meth($input, &optr);
if (!SWIG_IsOK(ores)) {
%dirout_fail(ores,"$type");
Type *swig_optr = 0;
int swig_ores = asptr_meth($input, &swig_optr);
if (!SWIG_IsOK(swig_ores)) {
%dirout_fail(swig_ores,"$type");
} else {
if (!optr) {
if (!swig_optr) {
%dirout_nullref("$type");
}
}
$result = optr;
if (SWIG_IsNewObj(ores)) {
swig_acquire_ownership(optr);
$result = swig_optr;
if (SWIG_IsNewObj(swig_ores)) {
swig_acquire_ownership(swig_optr);
}
}
%typemap(directorfree,noblock=1) Type&