sim: Remove redundant export_method_cxx_predecls
The headers declared in export_method_cxx_predecls are redundant since a SimObject's main header is automatically included. Change-Id: Ied9e84630b36960e54efe91d16f8c66fba7e0da0 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Curtis Dunham <curtis.dunham@arm.com> Reviewed-by: Joe Gross <joseph.gross@amd.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
This commit is contained in:
@@ -498,8 +498,7 @@ class MetaSimObject(type):
|
||||
# suppresses inheritance by substituting in the base (null)
|
||||
# versions of these methods unless a different version is
|
||||
# explicitly supplied.
|
||||
for method_name in ('export_methods', 'export_method_cxx_predecls',
|
||||
'export_method_swig_predecls'):
|
||||
for method_name in ('export_methods', 'export_method_swig_predecls'):
|
||||
if method_name not in cls.__dict__:
|
||||
base_method = getattr(MetaSimObject, method_name)
|
||||
m = MethodType(base_method, cls, MetaSimObject)
|
||||
@@ -664,14 +663,6 @@ class MetaSimObject(type):
|
||||
def export_methods(cls, code):
|
||||
pass
|
||||
|
||||
# Generate the code needed as a prerequisite for the C++ methods
|
||||
# exported via export_methods() to be compiled in the _wrap.cc
|
||||
# file. Typically generates one or more #include statements. If
|
||||
# any methods are exported, typically at least the C++ header
|
||||
# declaring the relevant SimObject class must be included.
|
||||
def export_method_cxx_predecls(cls, code):
|
||||
pass
|
||||
|
||||
# Generate the code needed as a prerequisite for the C++ methods
|
||||
# exported via export_methods() to be processed by SWIG.
|
||||
# Typically generates one or more %include or %import statements.
|
||||
@@ -703,7 +694,6 @@ class MetaSimObject(type):
|
||||
for param in params:
|
||||
param.cxx_predecls(code)
|
||||
code('#include "${{cls.cxx_header}}"')
|
||||
cls.export_method_cxx_predecls(code)
|
||||
code('''\
|
||||
/**
|
||||
* This is a workaround for bug in swig. Prior to gcc 4.6.1 the STL
|
||||
|
||||
Reference in New Issue
Block a user