410c410
< 'cxx_bases' : list,
---
> 'cxx_extra_bases' : list,
444,445c444,445
< if 'cxx_bases' not in value_dict:
< value_dict['cxx_bases'] = []
---
> if 'cxx_extra_bases' not in value_dict:
> value_dict['cxx_extra_bases'] = []
737,738c737,738
< 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
936c936
< cxx_bases = [ "Drainable", "Serializable" ]
---
> cxx_extra_bases = [ "Drainable", "Serializable" ]