diff options
| author | Curtis Dunham <Curtis.Dunham@arm.com> | 2014-05-09 18:58:46 -0400 |
|---|---|---|
| committer | Curtis Dunham <Curtis.Dunham@arm.com> | 2014-05-09 18:58:46 -0400 |
| commit | ad019c5c58ac8983f53be2cdf87e7a81f260a5ef (patch) | |
| tree | 115769cb4636a317102c23f62130024af6c52982 /src | |
| parent | ecf774bc561f139a13539d40dde075710f89183c (diff) | |
| download | gem5-ad019c5c58ac8983f53be2cdf87e7a81f260a5ef.tar.xz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/python/m5/params.py | 20 |
1 files changed, 0 insertions, 20 deletions
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): |