summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/SimObject.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 6e61961bd..e051a972b 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -407,7 +407,7 @@ class MetaSimObject(type):
'cxx_type' : str,
'cxx_header' : str,
'type' : str,
- 'cxx_bases' : list,
+ 'cxx_extra_bases' : list,
'cxx_exports' : list,
'cxx_param_exports' : list,
}
@@ -441,8 +441,8 @@ class MetaSimObject(type):
value_dict[key] = val
if 'abstract' not in value_dict:
value_dict['abstract'] = False
- if 'cxx_bases' not in value_dict:
- value_dict['cxx_bases'] = []
+ if 'cxx_extra_bases' not in value_dict:
+ value_dict['cxx_extra_bases'] = []
if 'cxx_exports' not in value_dict:
value_dict['cxx_exports'] = cxx_exports
else:
@@ -734,8 +734,8 @@ module_init(py::module &m_internal)
code()
code.dedent()
- bases = [ cls._base.cxx_class ] + cls.cxx_bases if cls._base else \
- cls.cxx_bases
+ bases = [ cls._base.cxx_class ] + cls.cxx_extra_bases if \
+ cls._base else cls.cxx_extra_bases
if bases:
base_str = ", ".join(bases)
code('py::class_<${{cls.cxx_class}}, ${base_str}, ' \
@@ -933,7 +933,7 @@ class SimObject(object):
abstract = True
cxx_header = "sim/sim_object.hh"
- cxx_bases = [ "Drainable", "Serializable" ]
+ cxx_extra_bases = [ "Drainable", "Serializable" ]
eventq_index = Param.UInt32(Parent.eventq_index, "Event Queue Index")
cxx_exports = [