130a131
> 'swig_objdecls' : types.ListType,
227a229,231
> if 'swig_objdecls' not in cls._value_dict:
> cls._value_dict['swig_objdecls'] = []
>
348,352c352,354
< def cxx_decl(cls):
< if str(cls) != 'SimObject':
< base = cls.__bases__[0].type
< else:
< base = None
---
> def get_base(cls):
> if str(cls) == 'SimObject':
> return None
353a356,358
> return cls.__bases__[0].type
>
> def cxx_decl(cls):
382a388
> base = cls.get_base()
411,415c417
< if str(cls) != 'SimObject':
< base = cls.__bases__[0]
< else:
< base = None
<
---
> base = cls.get_base()
429a432,433
> base = cls.get_base()
>
436,440d439
< if str(cls) != 'SimObject':
< base = cls.__bases__[0]
< else:
< base = None
<
485a485
> swig_objdecls = [ '%include "python/swig/sim_object.i"' ]
795d794
< import internal
843,844c842
< system_ptr = internal.sim_object.convertToSystemPtr(self._ccObject)
< return system_ptr.getMemoryMode()
---
> return self._ccObject.getMemoryMode()
847d844
< import internal
852,853c849
< system_ptr = internal.sim_object.convertToSystemPtr(self._ccObject)
< system_ptr.setMemoryMode(mode)
---
> self._ccObject.setMemoryMode(mode)
858,860c854
< import internal
< cpu_ptr = internal.sim_object.convertToBaseCPUPtr(old_cpu._ccObject)
< self._ccObject.takeOverFrom(cpu_ptr)
---
> self._ccObject.takeOverFrom(old_cpu._ccObject)