sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -726,23 +726,12 @@ if len(swig_version) < 3 or \
print 'Error determining SWIG version.' print 'Error determining SWIG version.'
Exit(1) Exit(1)
min_swig_version = '1.3.34' min_swig_version = '2.0.4'
if compareVersions(swig_version[2], min_swig_version) < 0: if compareVersions(swig_version[2], min_swig_version) < 0:
print 'Error: SWIG version', min_swig_version, 'or newer required.' print 'Error: SWIG version', min_swig_version, 'or newer required.'
print ' Installed version:', swig_version[2] print ' Installed version:', swig_version[2]
Exit(1) Exit(1)
# Older versions of swig do not play well with more recent versions of
# gcc due to assumptions on implicit includes (cstddef) and use of
# namespaces
if main['GCC'] and compareVersions(gcc_version, '4.6') > 0 and \
compareVersions(swig_version[2], '2') < 0:
print '\n' + termcap.Yellow + termcap.Bold + \
'Warning: SWIG 1.x cause issues with gcc 4.6 and later.\n' + \
termcap.Normal + \
'Use SWIG 2.x to avoid assumptions on implicit includes\n' + \
'and use of namespaces\n'
# Set up SWIG flags & scanner # Set up SWIG flags & scanner
swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS') swig_flags=Split('-c++ -python -modern -templatereduce $_CPPINCFLAGS')
main.Append(SWIGFLAGS=swig_flags) main.Append(SWIGFLAGS=swig_flags)

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

@ -299,26 +299,6 @@ class VectorParamDesc(ParamDesc):
ptype = self.ptype_str ptype = self.ptype_str
cxx_type = self.ptype.cxx_type 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 >;') code('%template(vector_$ptype) std::vector< $cxx_type >;')
def cxx_predecls(self, code): def cxx_predecls(self, code):