From ad019c5c58ac8983f53be2cdf87e7a81f260a5ef Mon Sep 17 00:00:00 2001 From: Curtis Dunham Date: Fri, 9 May 2014 18:58:46 -0400 Subject: scons: Require SWIG >= 2.0.4 and remove vector typemaps SWIG commit fd666c1 (*) made it unnecessary for gem5 to have these typemaps to handle Vector types. * https://github.com/swig/swig/commit/fd666c1440628a847793bbe1333c27dfa2f757f0 --- src/python/m5/params.py | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/python/m5/params.py') diff --git a/src/python/m5/params.py b/src/python/m5/params.py index 0afc200a8..470b94754 100644 --- a/src/python/m5/params.py +++ b/src/python/m5/params.py @@ -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): -- cgit v1.2.3