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

avoid extra casting since they conflict with 'const', reported by James Bigler

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8263 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-06 23:08:06 +00:00
commit b73ca56b1e
2 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SWIG/Examples/test-suite/array_member.i
View file

@ -22,3 +22,23 @@ int get_value(int *x, int i) {
#ifdef __cplusplus
%inline
{
struct Material
{
};
class RayPacketData {
public:
enum {
Size = 32
};
Material const* hitMatl[Size];
};
}
#endif

10
SWIG/Lib/typemaps/swigtype.swg
View file

@ -120,22 +120,18 @@
/* memberin/globalin/varin, for fix arrays. */ /* memberin/globalin/varin, for fix arrays. */
%typemap(memberin) SWIGTYPE [ANY] { %typemap(memberin) SWIGTYPE [ANY] {
$basetype *inp = %static_cast($input, $basetype *); if ($input) {
if (inp) {
$basetype *dest = %static_cast($1, $basetype *);
size_t ii = 0; size_t ii = 0;
for (; ii < $dim0; ++ii) dest[ii] = inp[ii]; for (; ii < $dim0; ++ii) $1[ii] = $input[ii];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }
} }
%typemap(globalin) SWIGTYPE [ANY] { %typemap(globalin) SWIGTYPE [ANY] {
$basetype *inp = %static_cast($input, $basetype *);
if (inp) { if (inp) {
$basetype *dest = %static_cast($1, $basetype *);
size_t ii = 0; size_t ii = 0;
for (; ii < $dim0; ++ii) dest[ii] = inp[ii]; for (; ii < $dim0; ++ii) $1[ii] = $input[ii];
} else { } else {
%variable_nullref("$type","$name"); %variable_nullref("$type","$name");
} }