derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scons: Require SWIG >= 2.0.4 and remove vector typemaps

Browse Source 
SWIG commit fd666c1 (*) made it unnecessary for gem5 to have these
typemaps to handle Vector types.

* fd666c1440
This commit is contained in:
Curtis Dunham
2014-05-09 18:58:46 -04:00
parent ecf774bc56
commit ad019c5c58
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/python/m5/params.py
View File

@@ -299,26 +299,6 @@ class VectorParamDesc(ParamDesc):
ptype = self.ptype_str
cxx_type = self.ptype.cxx_type
code('''\
%typemap(in) std::vector< $cxx_type >::value_type {
if (SWIG_ConvertPtr($$input, (void **)&$$1, $$1_descriptor, 0) == -1) {
if (SWIG_ConvertPtr($$input, (void **)&$$1,
$$descriptor($cxx_type), 0) == -1) {
return NULL;
}
}
}
%typemap(in) std::vector< $cxx_type >::value_type * {
if (SWIG_ConvertPtr($$input, (void **)&$$1, $$1_descriptor, 0) == -1) {
if (SWIG_ConvertPtr($$input, (void **)&$$1,
$$descriptor($cxx_type *), 0) == -1) {
return NULL;
}
}
}
''')
code('%template(vector_$ptype) std::vector< $cxx_type >;')
def cxx_predecls(self, code):